From 46b85885ec8aea1e315f7143f9b743cc502189f4 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 22 Jan 2024 21:38:10 -0500 Subject: [PATCH 1/9] Change yaml to use new action Signed-off-by: James Struga --- .github/workflows/build-core.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-core.yml b/.github/workflows/build-core.yml index 6de96a7..6210031 100644 --- a/.github/workflows/build-core.yml +++ b/.github/workflows/build-core.yml @@ -4,7 +4,7 @@ on: - cron: '30 6 * * *' push: branches: - - v2.x/staging + - v3.x/staging pull_request: types: [opened, reopened, synchronize] @@ -30,9 +30,9 @@ on: description: 'zlux-shared PR number' required: false DEFAULT_BRANCH: - description: 'please enter the default branch you would like to build with, default will be v2.x/staging' + description: 'please enter the default branch you would like to build with, default will be v3.x/staging' required: false - default: 'v2.x/staging' + default: 'v3.x/staging' jobs: check-permission: @@ -159,7 +159,7 @@ jobs: JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }} - name: '[Prep 4] prepare workflow' - uses: zowe-actions/zlux-builds/core/prepare@v2.x/main + uses: zowe-actions/zlux-builds/core/prepare@v3.x/main with: github-user: ${{ secrets.ZOWE_ROBOT_USER }} github-password: ${{ secrets.ZOWE_ROBOT_TOKEN }} @@ -168,7 +168,7 @@ jobs: default-base: ${{ github.event.inputs.DEFAULT_BRANCH }} - name: '[Prep 5] build' - uses: zowe-actions/zlux-builds/core/build@v2.x/main + uses: zowe-actions/zlux-builds/core/build@v3.x/main with: zlux-app-manager: ${{ github.event.inputs.ZLUX_APP_MANAGER }} zlux-app-server: ${{ github.event.inputs.ZLUX_APP_SERVER }} @@ -178,12 +178,12 @@ jobs: zlux-shared: ${{ github.event.inputs.ZLUX_SHARED }} - name: '[Prep 6] packaging' - uses: zowe-actions/zlux-builds/core/package@v2.x/main + uses: zowe-actions/zlux-builds/core/package@v3.x/main with: pax-ssh-username: ${{ secrets.SSH_MARIST_USERNAME }} pax-ssh-password: ${{ secrets.SSH_MARIST_RACF_PASSWORD }} pax-name: zlux-core - name: '[Prep 7] deploy' - uses: zowe-actions/zlux-builds/core/deploy@v2.x/main + uses: zowe-actions/zlux-builds/core/deploy@v3.x/main From f9530301dedd1aa2b7de84de9b2dca0e87455461 Mon Sep 17 00:00:00 2001 From: James Struga Date: Fri, 9 Aug 2024 08:47:09 -0400 Subject: [PATCH 2/9] Update v3 (#139) * Update build script to pass more strict npm installs/npm builds (#136) * fix node version (#119) Signed-off-by: James Struga * Added legacy npm install for out of date RS's Carbon Components Signed-off-by: Leanid Astrakou --------- Signed-off-by: James Struga Signed-off-by: Leanid Astrakou Co-authored-by: zowe-robot <42546701+zowe-robot@users.noreply.github.com> Co-authored-by: James Struga * Remove app-generator from build output (#137) Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: James Struga Signed-off-by: Leanid Astrakou Signed-off-by: 1000TurquoisePogs Co-authored-by: Leanid Astrakou Co-authored-by: zowe-robot <42546701+zowe-robot@users.noreply.github.com> Co-authored-by: 1000TurquoisePogs Co-authored-by: James Struga --- build_ng2.xml | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/build_ng2.xml b/build_ng2.xml index 9033421..b9afdba 100644 --- a/build_ng2.xml +++ b/build_ng2.xml @@ -30,7 +30,8 @@ - + + @@ -76,6 +77,9 @@ + + + @@ -238,6 +242,33 @@ + + + + + + + + + + + + + + + + + + + Date: Wed, 28 Aug 2024 16:25:32 -0400 Subject: [PATCH 3/9] V3 plugins spacing enhancement (#140) * Update build script to pass more strict npm installs/npm builds (#136) * fix node version (#119) Signed-off-by: James Struga * Added legacy npm install for out of date RS's Carbon Components Signed-off-by: Leanid Astrakou --------- Signed-off-by: James Struga Signed-off-by: Leanid Astrakou Co-authored-by: zowe-robot <42546701+zowe-robot@users.noreply.github.com> Co-authored-by: James Struga * Remove app-generator from build output (#137) Signed-off-by: 1000TurquoisePogs * Add new target Signed-off-by: James Struga * add condition Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * fix syntax Signed-off-by: James Struga * Bugfixes for v3 build branch (#141) * Update build-core.yml Signed-off-by: 1000TurquoisePogs * Update build-core.yml Signed-off-by: 1000TurquoisePogs * Update build-core.yml Signed-off-by: 1000TurquoisePogs * Do not run i18n temporarily (#142) * Do not run i18n temporarily Signed-off-by: 1000TurquoisePogs * Update build_ng2.xml Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs * Return to v3.x/main Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: 1000TurquoisePogs --------- Signed-off-by: James Struga Signed-off-by: Leanid Astrakou Signed-off-by: 1000TurquoisePogs Signed-off-by: James Struga Co-authored-by: Leanid Astrakou Co-authored-by: zowe-robot <42546701+zowe-robot@users.noreply.github.com> Co-authored-by: 1000TurquoisePogs Co-authored-by: James Struga --- .github/workflows/build-core.yml | 4 +-- build.xml | 4 +++ build_ng2.xml | 46 +++++++++++--------------------- production.xml | 1 + 4 files changed, 22 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build-core.yml b/.github/workflows/build-core.yml index 6210031..41ac0b4 100644 --- a/.github/workflows/build-core.yml +++ b/.github/workflows/build-core.yml @@ -149,9 +149,9 @@ jobs: ${{ runner.os }}-build-cache-node-modules- - name: '[Prep 2] Setup Node' - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: 16.15.0 + node-version: 18 - name: '[Prep 3] Setup jFrog CLI' uses: jfrog/setup-jfrog-cli@v2 diff --git a/build.xml b/build.xml index 896030c..32b99c3 100644 --- a/build.xml +++ b/build.xml @@ -70,6 +70,10 @@ + + + + diff --git a/build_ng2.xml b/build_ng2.xml index b9afdba..b9e418f 100644 --- a/build_ng2.xml +++ b/build_ng2.xml @@ -53,10 +53,6 @@ - - - - @@ -117,6 +113,21 @@ + + + + + + + + + + + + + + + @@ -268,33 +279,6 @@ - - - - - - - - - - - - - - - - - - - + From d19e2cd0318ff6419fe6aeabab582d8b95c2c5ba Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 29 Aug 2024 12:08:17 -0400 Subject: [PATCH 4/9] Update all the workflows (#143) * Update build script to pass more strict npm installs/npm builds (#136) * fix node version (#119) Signed-off-by: James Struga * Added legacy npm install for out of date RS's Carbon Components Signed-off-by: Leanid Astrakou --------- Signed-off-by: James Struga Signed-off-by: Leanid Astrakou Co-authored-by: zowe-robot <42546701+zowe-robot@users.noreply.github.com> Co-authored-by: James Struga * Remove app-generator from build output (#137) Signed-off-by: 1000TurquoisePogs * Update all the workflows for v3 Signed-off-by: James Struga --------- Signed-off-by: James Struga Signed-off-by: Leanid Astrakou Signed-off-by: 1000TurquoisePogs Signed-off-by: James Struga Co-authored-by: Leanid Astrakou Co-authored-by: zowe-robot <42546701+zowe-robot@users.noreply.github.com> Co-authored-by: 1000TurquoisePogs Co-authored-by: James Struga --- .github/workflows/build-core.yml | 2 ++ .github/workflows/docker.yml | 2 +- .github/workflows/rc-build.yml | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-core.yml b/.github/workflows/build-core.yml index 41ac0b4..b014e75 100644 --- a/.github/workflows/build-core.yml +++ b/.github/workflows/build-core.yml @@ -5,6 +5,8 @@ on: push: branches: - v3.x/staging + - v3.x/rc + - v3.x/master pull_request: types: [opened, reopened, synchronize] diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9142c32..fdcc40d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,7 +6,7 @@ on: branch: description: 'Please enter the zowe-install-packaging branch name' required: false - default: 'v2.x/staging' + default: 'v3.x/staging' release: description: 'Whether this is a test build or official release' required: true diff --git a/.github/workflows/rc-build.yml b/.github/workflows/rc-build.yml index c4cf68c..4bf0355 100644 --- a/.github/workflows/rc-build.yml +++ b/.github/workflows/rc-build.yml @@ -36,9 +36,9 @@ jobs: ${{ runner.os }}-build-cache-node-modules- - name: '[Prep 2] Setup Node' - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: 16.15.0 + node-version: 18 - name: '[Prep 3] Setup jFrog CLI' uses: jfrog/setup-jfrog-cli@v2 @@ -46,7 +46,7 @@ jobs: JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }} - name: '[Prep 4] prepare workflow' - uses: zowe-actions/zlux-builds/core/prepare@v2.x/rc + uses: zowe-actions/zlux-builds/core/prepare@v3.x/rc with: github-user: ${{ secrets.ZOWE_ROBOT_USER }} github-password: ${{ secrets.ZOWE_ROBOT_TOKEN }} @@ -55,14 +55,14 @@ jobs: zowe-version: ${{ github.event.inputs.ZOWE_VERSION }} - name: '[Prep 5] build' - uses: zowe-actions/zlux-builds/core/build@v2.x/rc + uses: zowe-actions/zlux-builds/core/build@v3.x/rc - name: '[Prep 6] packaging' - uses: zowe-actions/zlux-builds/core/package@v2.x/rc + uses: zowe-actions/zlux-builds/core/package@v3.x/rc with: pax-ssh-username: ${{ secrets.SSH_MARIST_USERNAME }} pax-ssh-password: ${{ secrets.SSH_MARIST_RACF_PASSWORD }} pax-name: zlux-core - name: '[Prep 7] deploy' - uses: zowe-actions/zlux-builds/core/deploy@v2.x/rc + uses: zowe-actions/zlux-builds/core/deploy@v3.x/rc From b54ba5da03c98dd6765f753fc6fef4d3ddc34197 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 14:10:38 -0400 Subject: [PATCH 5/9] use `-` instead of latest Signed-off-by: MarkAckert --- container/Dockerfile.zlux | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/container/Dockerfile.zlux b/container/Dockerfile.zlux index f1c8052..f9ab206 100644 --- a/container/Dockerfile.zlux +++ b/container/Dockerfile.zlux @@ -10,7 +10,7 @@ # # ######################################################################################### # base image tag -ARG ZOWE_BASE_IMAGE=latest-ubuntu +ARG ZOWE_BASE_IMAGE=3-ubuntu FROM zowe-docker-release.jfrog.io/ompzowe/base-node:${ZOWE_BASE_IMAGE} AS builder @@ -52,12 +52,12 @@ USER zowe RUN if [ ! -d ${ZWED_INSTALL_DIR}/share/zlux-app-server ]; then cd ${ZWED_INSTALL_DIR}/share && tar -xf zlux-core.tar; fi RUN cd ${ZWED_INSTALL_DIR}/share/zlux-app-server/bin && \ -chmod +x *.sh && \ -./install-container.sh + chmod +x *.sh && \ + ./install-container.sh # remove default explorer-ip plugin json RUN if [ -f ${ZWED_INSTALL_DIR}/share/zlux-app-server/defaults/plugins/org.zowe.explorer-ip.json ]; \ -then rm ${ZWED_INSTALL_DIR}/share/zlux-app-server/defaults/plugins/org.zowe.explorer-ip.json; fi + then rm ${ZWED_INSTALL_DIR}/share/zlux-app-server/defaults/plugins/org.zowe.explorer-ip.json; fi WORKDIR ${ZWED_INSTALL_DIR}/bin CMD ["./start-container.sh"] \ No newline at end of file From 232930b0250837fdfc2e969d635a6dcff19fb9a5 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Tue, 3 Sep 2024 12:20:30 -0400 Subject: [PATCH 6/9] remove build-arg-list Signed-off-by: MarkAckert --- .github/workflows/docker.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fdcc40d..9fe6a3e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -38,8 +38,6 @@ jobs: cpu-arch: amd64 - uses: zowe-actions/shared-actions/docker-build-local@main - with: - build-arg-list: ZOWE_BASE_IMAGE=latest-ubuntu timeout-minutes: 5 From 27100adda9feb2b258d085cc491a46d4e311431e Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Tue, 3 Sep 2024 12:21:46 -0400 Subject: [PATCH 7/9] remove other build-arg-list definitions Signed-off-by: MarkAckert --- .github/workflows/docker.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9fe6a3e..aac7637 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -63,8 +63,6 @@ jobs: cpu-arch: amd64 - uses: zowe-actions/shared-actions/docker-build-local@main - with: - build-arg-list: ZOWE_BASE_IMAGE=latest-ubi timeout-minutes: 5 build-ubuntu-s390x: @@ -93,7 +91,6 @@ jobs: zlinux-ssh-user: ${{ secrets.ZLINUX_SSH_USER }} zlinux-ssh-key: ${{ secrets.ZLINUX_SSH_KEY }} zlinux-ssh-passphrase: ${{ secrets.ZLINUX_SSH_PASSPHRASE }} - build-arg-list: ZOWE_BASE_IMAGE=latest-ubuntu timeout-minutes: 10 @@ -123,7 +120,6 @@ jobs: zlinux-ssh-user: ${{ secrets.ZLINUX_SSH_USER }} zlinux-ssh-key: ${{ secrets.ZLINUX_SSH_KEY }} zlinux-ssh-passphrase: ${{ secrets.ZLINUX_SSH_PASSPHRASE }} - build-arg-list: ZOWE_BASE_IMAGE=latest-ubi timeout-minutes: 10 From 7ef9fce6bd821da79460a8a377aea987af27c343 Mon Sep 17 00:00:00 2001 From: Himani1519 Date: Mon, 9 Sep 2024 21:55:53 +0530 Subject: [PATCH 8/9] Test build-core Signed-off-by: Himani1519 --- .github/workflows/build-core.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-core.yml b/.github/workflows/build-core.yml index b014e75..41ac0b4 100644 --- a/.github/workflows/build-core.yml +++ b/.github/workflows/build-core.yml @@ -5,8 +5,6 @@ on: push: branches: - v3.x/staging - - v3.x/rc - - v3.x/master pull_request: types: [opened, reopened, synchronize] From 7e67e18602fb15821a571fed42637eac2a41e71e Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Wed, 11 Sep 2024 10:38:10 -0400 Subject: [PATCH 9/9] Revert "Test build-core" --- .github/workflows/build-core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-core.yml b/.github/workflows/build-core.yml index 41ac0b4..b014e75 100644 --- a/.github/workflows/build-core.yml +++ b/.github/workflows/build-core.yml @@ -5,6 +5,8 @@ on: push: branches: - v3.x/staging + - v3.x/rc + - v3.x/master pull_request: types: [opened, reopened, synchronize]