From 81e07605eb62f3a524442b68c48a441bc586c7c2 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 9 Mar 2023 13:37:43 -0500 Subject: [PATCH 1/5] test npm Signed-off-by: James Struga --- .github/workflows/build_test.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 955185b..e644970 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -71,21 +71,6 @@ jobs: release: ${{ github.event.inputs.PERFORM_RELEASE }} plugin-version: ${{ github.event.inputs.BUILD_VERSION }} - - name: '[Prep 6] Build' - uses: zowe-actions/zlux-builds/plugins/zlux-plugins@v2.x/main - with: - build-zss: true - - - name: '[Prep 7] Packaging' - uses: zowe-actions/zlux-builds/plugins/make-pax@v2.x/main - with: - pax-ssh-username: ${{ secrets.SSH_MARIST_USERNAME }} - pax-ssh-password: ${{ secrets.SSH_MARIST_RACF_PASSWORD }} - pax-name: sample-angular-app - - - name: '[Prep 8] Deploy ' - uses: zowe-actions/zlux-builds/plugins/deploy-pax@v2.x/main - - name: '[Prep 9] NodeJS project setup' if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }} uses: zowe-actions/zlux-builds/plugins/npm-setup@v2.x/main From f0b0edcd5e252494e21134eb259d98611db80749 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 9 Mar 2023 13:40:00 -0500 Subject: [PATCH 2/5] remove release 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 e644970..7e0745d 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -72,7 +72,6 @@ jobs: plugin-version: ${{ github.event.inputs.BUILD_VERSION }} - name: '[Prep 9] NodeJS project setup' - if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }} uses: zowe-actions/zlux-builds/plugins/npm-setup@v2.x/main with: package-name: 'org.zowe.zlux-angular-file-tree' From ff94eb0e786fe1d18e52e3d36852583ab519ba3c Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 9 Mar 2023 14:16:56 -0500 Subject: [PATCH 3/5] add homedir Signed-off-by: James Struga --- .github/workflows/build_test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 7e0745d..e6b3cf7 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -70,6 +70,11 @@ jobs: github-branch: ${{ github.event.inputs.BRANCH_NAME }} release: ${{ github.event.inputs.PERFORM_RELEASE }} plugin-version: ${{ github.event.inputs.BUILD_VERSION }} + + - name: '[Prep 6] Build' + uses: zowe-actions/zlux-builds/plugins/zlux-plugins@v2.x/main + with: + build-zss: true - name: '[Prep 9] NodeJS project setup' uses: zowe-actions/zlux-builds/plugins/npm-setup@v2.x/main From de51d26e21edf565e9704bb20a0c89661715f072 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 9 Mar 2023 15:07:07 -0500 Subject: [PATCH 4/5] add homedir Signed-off-by: James Struga --- build/component/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/component/package.json b/build/component/package.json index 80d5ad7..2fabe0d 100644 --- a/build/component/package.json +++ b/build/component/package.json @@ -1,5 +1,5 @@ { - "name": "angular-sample", + "name": "@zowe/angular-sample", "version": "2.8.0", "description": "Sample App Showcasing Angular Adapter", "main": "angular-sample.pax", From 77ffb8b7d3df2e11596da4469e59d7ed8baa2437 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 9 Mar 2023 15:16:59 -0500 Subject: [PATCH 5/5] revert workflow Signed-off-by: James Struga --- .github/workflows/build_test.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index e6b3cf7..8362f81 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -70,13 +70,24 @@ jobs: github-branch: ${{ github.event.inputs.BRANCH_NAME }} release: ${{ github.event.inputs.PERFORM_RELEASE }} plugin-version: ${{ github.event.inputs.BUILD_VERSION }} - + - name: '[Prep 6] Build' uses: zowe-actions/zlux-builds/plugins/zlux-plugins@v2.x/main with: build-zss: true + - name: '[Prep 7] Packaging' + uses: zowe-actions/zlux-builds/plugins/make-pax@v2.x/main + with: + pax-ssh-username: ${{ secrets.SSH_MARIST_USERNAME }} + pax-ssh-password: ${{ secrets.SSH_MARIST_RACF_PASSWORD }} + pax-name: sample-angular-app + + - name: '[Prep 8] Deploy ' + uses: zowe-actions/zlux-builds/plugins/deploy-pax@v2.x/main + - name: '[Prep 9] NodeJS project setup' + if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }} uses: zowe-actions/zlux-builds/plugins/npm-setup@v2.x/main with: package-name: 'org.zowe.zlux-angular-file-tree' @@ -96,4 +107,4 @@ jobs: if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }} uses: zowe-actions/zlux-builds/plugins/bump-version@v2.x/main env: - GITHUB_TOKEN: ${{ secrets.ZOWE_ROBOT_TOKEN }} + GITHUB_TOKEN: ${{ secrets.ZOWE_ROBOT_TOKEN }} \ No newline at end of file