Skip to content

Commit

Permalink
Merge pull request #227 from zowe/v2.x/rc
Browse files Browse the repository at this point in the history
Merge RC to Main
  • Loading branch information
struga0258 committed Jul 12, 2024
2 parents 2caf2ed + 20b07b8 commit d0b9a4c
Show file tree
Hide file tree
Showing 106 changed files with 18,492 additions and 3,130 deletions.
35 changes: 35 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!-- Thank you for submitting a PR to Zowe! To help us understand, test, and give feedback on your code, please fill in the details below. -->

## Proposed changes
<!-- Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue. -->

This PR addresses Issue: [*Link to Github issue within https://github.com/zowe/zen/issues* if any]

This PR depends upon the following PRs:

## Type of change
Please delete options that are not relevant.
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Change in a documentation
- [ ] Refactor the code
- [ ] Chore, repository cleanup, updates the dependencies.
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)

## PR Checklist
Please delete options that are not relevant.
- [ ] If the changes in this PR are meant for the next release / mainline, this PR targets a "staging" branch.
- [ ] My code follows the style guidelines of this project (see: [Contributing guideline](https://github.com/zowe/zen/blob/v2.x/staging/CONTRIBUTING.md))
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] New and existing unit tests pass locally with my changes
- [ ] video or image is included if visual changes are made
<!-- - [ ] Relevant update to CHANGELOG.md -->
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works, or describe a test method below

## Testing
<!-- Describe how this code should be tested. I've you've added an automated or unit test, then describe how to run it. Otherwise, describe how you have tested it and how others should test it. -->

## Further comments
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, or if there are follow-up tasks and TODOs etc... -->
125 changes: 125 additions & 0 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
name: Build zen
on:
push:
branches:
- v2.x/main
- v2.x/staging

pull_request:
types: [opened, reopened, synchronize]

workflow_dispatch:
inputs:
BRANCH_NAME:
description: 'Specify branch name or PR (e.g. PR-41)'
required: false
PERFORM_RELEASE:
description: '[Release] perform release'
required: false
default: 'false'
type: boolean

jobs:

build-ubuntu:
runs-on: ubuntu-latest
steps:
- name: '[Prep 1] Setup Node'
uses: actions/setup-node@v2
with:
node-version: 18
- name: '[Prep 2] Setup jFrog CLI'
uses: jfrog/setup-jfrog-cli@v2
env:
JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }}
- name: '[Prep 3] Checkout'
uses: actions/checkout@v3
- name: '[prep 4] Install'
run: |
npm install
- name: '[prep 5] Package'
run: |
npm run make
- name: '[prep 6] Publish'
uses: zowe-actions/zlux-builds/zen/publish@v2.x/main
with:
os: ubuntu
perform-release: ${{ github.event.inputs.PERFORM_RELEASE }}


build-window:
runs-on: windows-latest
steps:
- name: '[Prep 1] Setup Node'
uses: actions/setup-node@v2
with:
node-version: 18
- name: '[Prep 2] Setup jFrog CLI'
uses: jfrog/setup-jfrog-cli@v2
env:
JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }}
- name: '[Prep 3] Checkout'
uses: actions/checkout@v3
- name: '[prep 4] Install'
run: |
npm install
- name: '[prep 5] Package'
run: |
npm run make
- name: '[prep 6] Publish'
uses: zowe-actions/zlux-builds/zen/publish@v2.x/main
with:
os: windows
perform-release: ${{ github.event.inputs.PERFORM_RELEASE }}

build-macos:
runs-on: macos-latest
steps:
- name: '[Prep 1] Setup jFrog CLI'
uses: jfrog/setup-jfrog-cli@v2
env:
JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }}
- name: '[Prep 2] Setup Node'
uses: actions/setup-node@v2
with:
node-version: 18
- name: '[Prep 3] Checkout'
uses: actions/checkout@v3
- name: '[Prep 4] Install Python 3.12 for npm appdmg'
uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: '[prep 5] Install'
run: |
python3 -m pip install setuptools
npm install
- name: '[prep 6] Package'
run: |
npm run make
- name: '[prep 7] Publish'
uses: zowe-actions/zlux-builds/zen/publish@v2.x/main
with:
os: macos
perform-release: ${{ github.event.inputs.PERFORM_RELEASE }}


post-build:
runs-on: ubuntu-latest
needs:
- build-ubuntu
- build-window
- build-macos
if: ${{ success() && github.event.inputs.PERFORM_RELEASE == 'true' }}
steps:
- name: '[Prep 3] Checkout'
uses: actions/checkout@v3

- name: '[Release 1] Release (if necessary)'
if: ${{ success() && github.event.inputs.PERFORM_RELEASE == 'true' }}
uses: zowe-actions/shared-actions/release@main

- name: '[Release 2] Bump Zen Version (if necessary)'
if: ${{ success() && github.event.inputs.PERFORM_RELEASE == 'true' }}
uses: zowe-actions/zlux-builds/zen/bump-version@v2.x/main
env:
GITHUB_TOKEN: ${{ secrets.ZOWE_ROBOT_TOKEN }}
26 changes: 26 additions & 0 deletions .github/workflows/test-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Lint TypeScript

on:
push:
branches:
- v2.x/staging
pull_request:
types: [opened, reopened, synchronize]

jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '18'

- name: Install Dependencies
run: npm ci

- name: Lint TypeScript
run: npm run lint
Loading

0 comments on commit d0b9a4c

Please sign in to comment.