From e3ee8b03c55bb9a66a03a0cad500610cb049bf2c Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Mon, 26 Feb 2024 13:37:07 +0100 Subject: [PATCH 1/3] immutable version update Signed-off-by: Martin Zeithaml --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b34fdf..3398426 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@material-ui/core": "4.11.0", "@material-ui/icons": "4.9.1", "babel-polyfill": "6.16.0", - "immutable": "3.8.1", + "immutable": "3.8.2", "interweave": "8.0.1", "lowlight": "2.4.0", "orion-editor-component": "0.0.14", @@ -7203,9 +7203,9 @@ } }, "node_modules/immutable": { - "version": "3.8.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/immutable/-/immutable-3.8.1.tgz", - "integrity": "sha512-0R2q5f83L0h+zizu3lAA3ZR/mzEl04U1jVVXIqf2rQbZs9eX5YGtx1EFQuuJJHzVXH10ur6hGKehR8yBOQmZlQ==", + "version": "3.8.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/immutable/-/immutable-3.8.2.tgz", + "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==", "engines": { "node": ">=0.10.0" } @@ -19142,9 +19142,9 @@ "dev": true }, "immutable": { - "version": "3.8.1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/immutable/-/immutable-3.8.1.tgz", - "integrity": "sha512-0R2q5f83L0h+zizu3lAA3ZR/mzEl04U1jVVXIqf2rQbZs9eX5YGtx1EFQuuJJHzVXH10ur6hGKehR8yBOQmZlQ==" + "version": "3.8.2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/immutable/-/immutable-3.8.2.tgz", + "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==" }, "import-fresh": { "version": "3.3.0", diff --git a/package.json b/package.json index b7ba54f..c3fc559 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@material-ui/core": "4.11.0", "@material-ui/icons": "4.9.1", "babel-polyfill": "6.16.0", - "immutable": "3.8.1", + "immutable": "3.8.2", "interweave": "8.0.1", "lowlight": "2.4.0", "orion-editor-component": "0.0.14", From 91d4f5c8ff27a452c9e15dcc987ecfd63cf969cf Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 26 Feb 2024 09:58:05 -0500 Subject: [PATCH 2/3] version update, minor actions/docker updates Signed-off-by: MarkAckert --- .github/workflows/build_test.yml | 2 +- container/Dockerfile | 13 +++++++------ manifest.yaml | 2 +- package.json | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index ce6e9e2..5712788 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -62,7 +62,7 @@ jobs: uses: zowe-actions/shared-actions/prepare-workflow@main - name: '[Prep 5] Setup Node' - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 16 diff --git a/container/Dockerfile b/container/Dockerfile index 8b3e062..f7d9fa4 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -17,12 +17,12 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base-node:${ZOWE_BASE_IMAGE} AS builde ################################## # labels LABEL name="USS Explorer" \ - maintainer="jack-tiefeng.jia@ibm.com" \ - vendor="Zowe" \ - version="0.0.0" \ - release="0" \ - summary="IBM z/OS Unix Files UI service" \ - description="This Zowe UI component can display unix files on z/OS" + maintainer="jack-tiefeng.jia@ibm.com" \ + vendor="Zowe" \ + version="0.0.0" \ + release="0" \ + summary="IBM z/OS Unix Files UI service" \ + description="This Zowe UI component can display unix files on z/OS" ################################## # switch context @@ -37,6 +37,7 @@ COPY --chown=zowe:zowe component . # build component # pretty same as .pax/prepare-workspace.sh. any way we can merge? RUN npm ci --no-audit --ignore-scripts \ + && npm install -g npm@7.24.2 \ && npm run prod \ && mkdir -p final/web \ && cp README.md final \ diff --git a/manifest.yaml b/manifest.yaml index 56ce501..b86aa06 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -5,7 +5,7 @@ id: org.zowe.explorer-uss # Component version is defined in gradle.properties for Gradle project # Human readable component name title: USS Explorer -version: 2.0.7 +version: 2.0.9 # Human readable component description description: IBM z/OS Unix Files UI service license: EPL-2.0 diff --git a/package.json b/package.json index c3fc559..b08d962 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "explorer-uss", - "version": "2.0.8", + "version": "2.0.9", "types": "module", "directories": { "test": "tests" From 3ec832817dcc948659fbf8733582c5983575f9ee Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 26 Feb 2024 10:03:29 -0500 Subject: [PATCH 3/3] remove broken container cmd Signed-off-by: MarkAckert --- container/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/container/Dockerfile b/container/Dockerfile index f7d9fa4..da63ed4 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -37,7 +37,6 @@ COPY --chown=zowe:zowe component . # build component # pretty same as .pax/prepare-workspace.sh. any way we can merge? RUN npm ci --no-audit --ignore-scripts \ - && npm install -g npm@7.24.2 \ && npm run prod \ && mkdir -p final/web \ && cp README.md final \