From e5e865d986b68e76cde3c463f87e82b2f46deb05 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 8 Feb 2023 19:42:51 -0500 Subject: [PATCH 1/4] fix versions Signed-off-by: James Struga --- .github/workflows/build_test.yml | 16 +++++++++++----- build/component/package.json | 2 +- manifest.yaml | 2 +- nodeServer/package.json | 2 +- webClient/package.json | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index bb1323b..bb88750 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -61,7 +61,7 @@ jobs: env: JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }} - - name: '[Prep 5] prepare workflow' + - name: '[Prep 5] Prepare Workflow' uses: zowe-actions/zlux-builds/plugins/prepare-workflow@v2.x/main with: github-user: ${{ secrets.ZOWE_ROBOT_USER }} @@ -70,19 +70,19 @@ jobs: github-branch: ${{ github.event.inputs.BRANCH_NAME }} release: ${{ github.event.inputs.PERFORM_RELEASE }} - - name: '[Prep 6] build' + - name: '[Prep 6] Build' uses: zowe-actions/zlux-builds/plugins/zlux-plugins@v2.x/main with: build-zss: true - - name: '[Prep 7] packaging' + - 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 ' + - name: '[Prep 8] Deploy ' uses: zowe-actions/zlux-builds/plugins/deploy-pax@v2.x/main - name: '[Prep 9] NodeJS project setup' @@ -100,4 +100,10 @@ jobs: - name: '[Prep 10] Publish NPM Package ' if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }} - uses: zowe-actions/zlux-builds/plugins/npm-publish@v2.x/main \ No newline at end of file + uses: zowe-actions/zlux-builds/plugins/npm-publish@v2.x/main + + - name: '[Prep 11] Bump Staging Version ' + 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 }} diff --git a/build/component/package.json b/build/component/package.json index 739c0e4..86c2c9d 100644 --- a/build/component/package.json +++ b/build/component/package.json @@ -1,6 +1,6 @@ { "name": "angular-sample", - "version": "2.6.0", + "version": "2.7.0", "description": "Sample App Showcasing Angular Adapter", "main": "angular-sample.pax", "homepgae": "https://zowe.org", diff --git a/manifest.yaml b/manifest.yaml index 40b7403..945bcb3 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -2,7 +2,7 @@ name: angular-sample id: org.zowe.zlux.sample.angular # Without the v -version: 2.6.0 +version: 2.7.0 # Human readable component name title: Angular Sample # Human readable component description diff --git a/nodeServer/package.json b/nodeServer/package.json index b48c830..699dd0c 100644 --- a/nodeServer/package.json +++ b/nodeServer/package.json @@ -1,6 +1,6 @@ { "name": "org.zowe.zlux.sample.angular.nodeserver", - "version": "1.1.0", + "version": "2.7.0", "description": "Hello World message", "scripts": { "build": "tsc", diff --git a/webClient/package.json b/webClient/package.json index f8e5644..0bb14d4 100644 --- a/webClient/package.json +++ b/webClient/package.json @@ -1,6 +1,6 @@ { "name": "org.zowe.zlux.sample.angular.webclient", - "version": "2.0.0", + "version": "2.7.0", "scripts": { "start": "webpack --progress --colors --watch", "build": "webpack --progress --colors", From 822c9e940609e6b4030c85190b89069730144466 Mon Sep 17 00:00:00 2001 From: James Struga Date: Wed, 8 Feb 2023 19:52:08 -0500 Subject: [PATCH 2/4] missing plugin def Signed-off-by: James Struga --- package-lock.json | 65 +++++++++++++++++++++++++++++++++++++++++++ pluginDefinition.json | 2 +- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..68d0aab --- /dev/null +++ b/package-lock.json @@ -0,0 +1,65 @@ +{ + "name": "sample-angular-app", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "semver": "^7.3.8" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } +} diff --git a/pluginDefinition.json b/pluginDefinition.json index aa3d92a..b697fcf 100644 --- a/pluginDefinition.json +++ b/pluginDefinition.json @@ -1,7 +1,7 @@ { "identifier": "org.zowe.zlux.sample.angular", "apiVersion": "2.0.0", - "pluginVersion": "2.0.1", + "pluginVersion": "2.7.0", "pluginType": "application", "license": "EPL-2.0", "author": "Zowe", From cfd42087fe9e09011284a23fd747c8f3ad74d39f Mon Sep 17 00:00:00 2001 From: James Struga Date: Fri, 10 Feb 2023 11:08:26 -0500 Subject: [PATCH 3/4] change node version Signed-off-by: James Struga --- .github/workflows/build_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index bb88750..955185b 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -54,7 +54,7 @@ jobs: - name: '[Prep 3] Setup Node' uses: actions/setup-node@v2 with: - node-version: 10.24.1 + node-version: 16.15.0 - name: '[Prep 4] Setup jFrog CLI' uses: jfrog/setup-jfrog-cli@v2 @@ -69,6 +69,7 @@ jobs: github-email: ${{ secrets.ZOWE_ROBOT_EMAIL }} 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 From bfd2ddfe8f5543479c84e75d61d17cf4a4cd3cb0 Mon Sep 17 00:00:00 2001 From: James Struga Date: Fri, 10 Feb 2023 12:12:20 -0500 Subject: [PATCH 4/4] add test exit 0 Signed-off-by: James Struga --- nodeServer/package.json | 3 ++- webClient/package.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nodeServer/package.json b/nodeServer/package.json index 699dd0c..e31b12f 100644 --- a/nodeServer/package.json +++ b/nodeServer/package.json @@ -4,7 +4,8 @@ "description": "Hello World message", "scripts": { "build": "tsc", - "start": "tsc --watch" + "start": "tsc --watch", + "test": "exit 0" }, "dependencies": {}, "devDependencies": { diff --git a/webClient/package.json b/webClient/package.json index 0bb14d4..afb799e 100644 --- a/webClient/package.json +++ b/webClient/package.json @@ -5,7 +5,8 @@ "start": "webpack --progress --colors --watch", "build": "webpack --progress --colors", "i18n": "ng-xi18n -p tsconfig.i18n.json --i18nFormat=xlf --outFile=messages.xlf && xliffmerge -p xliffmerge.json", - "lint": "tslint -c tslint.json \"./**/*.ts\"" + "lint": "tslint -c tslint.json \"./**/*.ts\"", + "test": "exit 0" }, "private": true, "devDependencies": {