From 1ac71d23f6cae9f0559f969f9ca8ba137ebea51f Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 7 Aug 2023 16:55:09 -0400 Subject: [PATCH 01/11] add workflow to test build Signed-off-by: James Struga --- .github/workflows/build_test.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/build_test.yml diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml new file mode 100644 index 00000000..68adc536 --- /dev/null +++ b/.github/workflows/build_test.yml @@ -0,0 +1,20 @@ +name: Build and Test Workflow +on: + push: + branches: + - main + pull_request: + types: [opened, reopened, synchronize] + +jobs: + + build-test: + runs-on: ubuntu-latest + needs: check-permission + steps: + - name: '[Prep 1] Checkout' + uses: actions/checkout@v3 + + - name: '[prep 2] Install' + run: | + npm install \ No newline at end of file From e007339bae4293f30165f256f20b5f1815b3c925 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 7 Aug 2023 17:03:08 -0400 Subject: [PATCH 02/11] remove dependency Signed-off-by: James Struga --- .github/workflows/build_test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 68adc536..0b3d3e66 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -10,7 +10,6 @@ jobs: build-test: runs-on: ubuntu-latest - needs: check-permission steps: - name: '[Prep 1] Checkout' uses: actions/checkout@v3 From c0da16838d798f9430cfc8927e9d38dc6ef90c45 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 7 Aug 2023 17:07:11 -0400 Subject: [PATCH 03/11] add all 3 os Signed-off-by: James Struga --- .github/workflows/build_test.yml | 37 ++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 0b3d3e66..1fba448e 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -8,7 +8,7 @@ on: jobs: - build-test: + build-ubuntu: runs-on: ubuntu-latest steps: - name: '[Prep 1] Checkout' @@ -16,4 +16,37 @@ jobs: - name: '[prep 2] Install' run: | - npm install \ No newline at end of file + npm install + + - name: '[prep 3] Package' + run: | + npm run make + + + build-window: + runs-on: windows-latest + steps: + - name: '[Prep 1] Checkout' + uses: actions/checkout@v3 + + - name: '[prep 2] Install' + run: | + npm install + + - name: '[prep 3] Package' + run: | + npm run make + + build-macos: + runs-on: macos-latest + steps: + - name: '[Prep 1] Checkout' + uses: actions/checkout@v3 + + - name: '[prep 2] Install' + run: | + npm install + + - name: '[prep 3] Package' + run: | + npm run make \ No newline at end of file From ead77f4de811bad14d7c9cc40e4195aa61e5f037 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 7 Aug 2023 23:19:35 -0400 Subject: [PATCH 04/11] add author and desc Signed-off-by: James Struga --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index d30054fd..27612504 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,7 @@ { "name": "zowe-enterprise-necessity", + "author": "Zowe", + "description": "An example Electron app", "productName": "zowe-enterprise-necessity", "version": "1.0.0", "description": "Zowe Enterprise Necessity", From 3d04f439c7da31a9328917318fb9acfd7bd22c39 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 8 Aug 2023 12:45:34 -0400 Subject: [PATCH 05/11] add publish step Signed-off-by: James Struga --- .github/workflows/build_test.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 1fba448e..a8973884 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -1,4 +1,4 @@ -name: Build and Test Workflow +name: Build zen on: push: branches: @@ -11,17 +11,25 @@ jobs: build-ubuntu: runs-on: ubuntu-latest steps: - - name: '[Prep 1] Checkout' + - name: '[Prep 1] Setup Node' + uses: actions/setup-node@v2 + with: + node-version: 18 + + - name: '[Prep 2] Checkout' uses: actions/checkout@v3 - - name: '[prep 2] Install' + - name: '[prep 3] Install' run: | npm install - - name: '[prep 3] Package' + - name: '[prep 4] Package' run: | npm run make + - name: '[prep 5] Publish' + uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish + build-window: runs-on: windows-latest From f342d8b3da4b9d49e9d85ddba72c36365a9ededc Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 8 Aug 2023 14:20:53 -0400 Subject: [PATCH 06/11] add jfrog cli Signed-off-by: James Struga --- .github/workflows/build_test.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index a8973884..4faf89db 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -16,18 +16,23 @@ jobs: with: node-version: 18 - - name: '[Prep 2] Checkout' + - 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 3] Install' + - name: '[prep 4] Install' run: | npm install - - name: '[prep 4] Package' + - name: '[prep 5] Package' run: | npm run make - - name: '[prep 5] Publish' + - name: '[prep 6] Publish' uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish From dd63d8a425c774b1386f193222069bf5416cc0b0 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 8 Aug 2023 20:26:47 -0400 Subject: [PATCH 07/11] add test Signed-off-by: James Struga --- .github/workflows/build_test.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 4faf89db..17f3ef93 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -39,6 +39,12 @@ jobs: build-window: runs-on: windows-latest steps: + + - name: '[Prep 2] Setup jFrog CLI' + uses: jfrog/setup-jfrog-cli@v2 + env: + JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }} + - name: '[Prep 1] Checkout' uses: actions/checkout@v3 @@ -49,10 +55,18 @@ jobs: - name: '[prep 3] Package' run: | npm run make + - name: '[prep 6] Publish' + uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish build-macos: runs-on: macos-latest steps: + + - name: '[Prep 2] Setup jFrog CLI' + uses: jfrog/setup-jfrog-cli@v2 + env: + JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }} + - name: '[Prep 1] Checkout' uses: actions/checkout@v3 @@ -62,4 +76,7 @@ jobs: - name: '[prep 3] Package' run: | - npm run make \ No newline at end of file + npm run make + + - name: '[prep 6] Publish' + uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish \ No newline at end of file From d2cce411a011bf5968ce40ccb5a08ff13d1e6ece Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 8 Aug 2023 20:55:03 -0400 Subject: [PATCH 08/11] add new logic Signed-off-by: James Struga --- .github/workflows/build_test.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 17f3ef93..8ba005d3 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -34,6 +34,8 @@ jobs: - name: '[prep 6] Publish' uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish + with: + os: ubuntu build-window: @@ -57,6 +59,8 @@ jobs: npm run make - name: '[prep 6] Publish' uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish + with: + os: windows build-macos: runs-on: macos-latest @@ -79,4 +83,6 @@ jobs: npm run make - name: '[prep 6] Publish' - uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish \ No newline at end of file + uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish + with: + os: macos \ No newline at end of file From dc276a6e13b7ae303fa1fb6629e4e3b4c6db2f56 Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 8 Aug 2023 21:34:31 -0400 Subject: [PATCH 09/11] add maker dmg Signed-off-by: James Struga --- forge.config.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge.config.ts b/forge.config.ts index 397db492..0145a5e7 100644 --- a/forge.config.ts +++ b/forge.config.ts @@ -10,6 +10,7 @@ import type { ForgeConfig } from '@electron-forge/shared-types'; import { MakerSquirrel } from '@electron-forge/maker-squirrel'; +import { MakerDMG } from '@electron-forge/maker-dmg'; import { MakerZIP } from '@electron-forge/maker-zip'; import { MakerDeb } from '@electron-forge/maker-deb'; import { MakerRpm } from '@electron-forge/maker-rpm'; @@ -21,7 +22,7 @@ import { rendererConfig } from './configs/webpack.renderer.config'; const config: ForgeConfig = { packagerConfig: {}, rebuildConfig: {}, - makers: [new MakerSquirrel({}), new MakerZIP({}, ['darwin']), new MakerRpm({}), new MakerDeb({})], + makers: [new MakerSquirrel({}), new MakerDMG({}), new MakerZIP({}, ['darwin']), new MakerRpm({}), new MakerDeb({})], plugins: [ new WebpackPlugin({ mainConfig, From 3bc56effb5ed825a8cbe23cf7d71153bcdf067bd Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 8 Aug 2023 22:21:10 -0400 Subject: [PATCH 10/11] update package.json Signed-off-by: James Struga --- forge.config.ts | 3 +-- package.json | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge.config.ts b/forge.config.ts index 0145a5e7..3a4685db 100644 --- a/forge.config.ts +++ b/forge.config.ts @@ -11,7 +11,6 @@ import type { ForgeConfig } from '@electron-forge/shared-types'; import { MakerSquirrel } from '@electron-forge/maker-squirrel'; import { MakerDMG } from '@electron-forge/maker-dmg'; -import { MakerZIP } from '@electron-forge/maker-zip'; import { MakerDeb } from '@electron-forge/maker-deb'; import { MakerRpm } from '@electron-forge/maker-rpm'; import { WebpackPlugin } from '@electron-forge/plugin-webpack'; @@ -22,7 +21,7 @@ import { rendererConfig } from './configs/webpack.renderer.config'; const config: ForgeConfig = { packagerConfig: {}, rebuildConfig: {}, - makers: [new MakerSquirrel({}), new MakerDMG({}), new MakerZIP({}, ['darwin']), new MakerRpm({}), new MakerDeb({})], + makers: [new MakerSquirrel({}), new MakerDMG({}), new MakerRpm({}), new MakerDeb({})], plugins: [ new WebpackPlugin({ mainConfig, diff --git a/package.json b/package.json index 27612504..3e76d399 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "devDependencies": { "@electron-forge/cli": "^6.0.5", "@electron-forge/maker-deb": "^6.0.5", + "@electron-forge/maker-dmg": "^6.0.5", "@electron-forge/maker-rpm": "^6.0.5", "@electron-forge/maker-squirrel": "^6.0.5", "@electron-forge/maker-zip": "^6.0.5", From 2d77aa3db5531ca5d86f599a3327b27410ac4451 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 9 Aug 2023 11:02:55 -0400 Subject: [PATCH 11/11] clean up Signed-off-by: James Struga --- .github/workflows/build_test.yml | 47 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 8ba005d3..3a9334e8 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -3,8 +3,15 @@ on: push: branches: - main + pull_request: types: [opened, reopened, synchronize] + + workflow_dispatch: + inputs: + BRANCH_NAME: + description: 'Specify branch name or PR (e.g. PR-41)' + required: false jobs: @@ -15,23 +22,18 @@ jobs: 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@users/jstruga/add-zen-publish with: @@ -41,20 +43,20 @@ jobs: 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 1] Checkout' + - name: '[Prep 3] Checkout' uses: actions/checkout@v3 - - - name: '[prep 2] Install' + - name: '[prep 4] Install' run: | - npm install - - - name: '[prep 3] Package' + npm install + - name: '[prep 5] Package' run: | npm run make - name: '[prep 6] Publish' @@ -65,23 +67,22 @@ jobs: build-macos: runs-on: macos-latest steps: - - - name: '[Prep 2] Setup jFrog CLI' + - name: '[Prep 1] Setup jFrog CLI' uses: jfrog/setup-jfrog-cli@v2 env: JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }} - - - name: '[Prep 1] Checkout' + - name: '[Prep 2] Setup Node' + uses: actions/setup-node@v2 + with: + node-version: 18 + - name: '[Prep 3] Checkout' uses: actions/checkout@v3 - - - name: '[prep 2] Install' + - name: '[prep 4] Install' run: | - npm install - - - name: '[prep 3] Package' + npm install + - name: '[prep 5] Package' run: | npm run make - - name: '[prep 6] Publish' uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish with: