Skip to content

Commit

Permalink
Merge pull request #314 from zowe/v3.1.0/master
Browse files Browse the repository at this point in the history
Update zowe component versions for 3.1.0
  • Loading branch information
zFernand0 authored Jan 13, 2025
2 parents 487d409 + 2e00d97 commit 4d4f2af
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/manifest_updateVersions.createPR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: |
declare -A repoAndComponent
repoAndComponent[cli]=zowe-cli
repoAndComponent[cics-for-zowe-cli]=zowe-cli-cics-plugin
repoAndComponent[cics-for-zowe-cli]=cics-for-zowe-client
repoAndComponent[db2-for-zowe-cli]=zowe-cli-db2-plugin
repoAndComponent[mq-for-zowe-cli]=zowe-cli-mq-plugin
repoAndComponent[zos-ftp-for-zowe-cli]=zowe-cli-ftp-plugin
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/zowe-cli-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18.x, 20.x]
node-version: [18.x, 20.x, 22.x]
os: [windows-latest, ubuntu-latest, macos-latest, macos-13]

steps:
Expand Down Expand Up @@ -257,4 +257,4 @@ jobs:
- name: Install Plugins
shell: bash
working-directory: zowe-cli-bundle
run: unzip -o zowe-cli-plugins-*.zip && node ../scripts/install-check.js && zowe plugins install *-for-zowe-cli.tgz && zowe plugins validate --fail-on-error
run: unzip -o zowe-cli-plugins-*.zip && node ../scripts/install-check.js ${{ inputs.package-tag }} && zowe plugins install *-for-zowe-cli.tgz && zowe plugins validate --fail-on-error
7 changes: 4 additions & 3 deletions .github/workflows/zowe-versions_updateVersions_createPR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,18 @@ jobs:
echo "| Updated Package | Old Version | New Version |" >> description.txt
echo "| --- | --- | --- |" >> description.txt
for component in $components; do
current_version=$(grep -A 2 "^ $component:" zowe-versions.yaml | grep "$zowe_version" | awk '{print $2}' | tr -d '\r')
current_version=$(yq -r ".packages.\"$component\".\"$zowe_version\"" zowe-versions.yaml)
new_version=$(npm view @zowe/$component "dist-tags.$zowe_version" --@zowe:registry=https://zowe.jfrog.io/zowe/api/npm/npm-local-release/)
if [[ "$new_version" != "$current_version" ]]; then
echo "| $component | $current_version | $new_version |" >> description.txt
# Replaces the version number. If it doesn't match on the first line after the component, it goes to the next line and checks again.
sed -i -E "/^ $component:/ { n; s/($zowe_version: ).*/\1$new_version/; t; n; s/($zowe_version: ).*/\1$new_version/ }" zowe-versions.yaml
yq -i ".packages.\"$component\".\"$zowe_version\" = \"$new_version\"" zowe-versions.yaml
fi
done
# Update zowe-versions.yaml tags section (always sets rc = 1)
sed -i -E "/$zowe_version:/ { n; s/(version: ).*/\1$version/; n; s/(rc: )[0-9]+/\11/ }" zowe-versions.yaml
yq -i ".tags.\"$zowe_version\".version = \"$version\"" zowe-versions.yaml
yq -i ".tags.\"$zowe_version\".rc = 1" zowe-versions.yaml
- name: Commit and Push Changes
Expand Down
4 changes: 2 additions & 2 deletions scripts/install-check.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const fs = require("fs");
const path = require("path");

if (process.arch === "arm64") {
// ARM64 support does not exist for DB2
if (process.arch === "arm64" && process.argv[2] !== "zowe-v3-lts") {
// ARM64 support does not exist for DB2 until v3 LTS
fs.unlinkSync(path.join(process.cwd(), "db2-for-zowe-cli.tgz"));
}
40 changes: 19 additions & 21 deletions zowe-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,86 +19,86 @@ packages:
next: true
zowe-v1-lts: 4.18.27
zowe-v2-lts: 5.27.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
cli-test-utils:
next: true
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
secrets-for-zowe-sdk:
next: true
zowe-v2-lts: 7.18.6
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.10.4
core-for-zowe-sdk:
next: true
zowe-v1-lts: 6.40.31
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
zos-uss-for-zowe-sdk:
next: true
zowe-v1-lts: 6.40.31
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
provisioning-for-zowe-sdk:
next: true
zowe-v1-lts: 6.40.31
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
zos-console-for-zowe-sdk:
next: true
zowe-v1-lts: 6.40.31
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
zos-files-for-zowe-sdk:
next: true
zowe-v1-lts: 6.40.31
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
zos-logs-for-zowe-sdk:
next: true
zowe-v1-lts: 6.40.31
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
zosmf-for-zowe-sdk:
next: true
zowe-v1-lts: 6.40.31
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
zos-workflows-for-zowe-sdk:
next: true
zowe-v1-lts: 6.40.31
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
zos-jobs-for-zowe-sdk:
next: true
zowe-v1-lts: 6.40.31
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
zos-tso-for-zowe-sdk:
next: true
zowe-v1-lts: 6.40.31
zowe-v2-lts: 7.29.0
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
cli:
next: true
zowe-v1-lts: 6.40.32
zowe-v2-lts: 7.29.1
zowe-v3-lts: 8.0.0
zowe-v3-lts: 8.11.0
# CLI plug-ins
cics-for-zowe-sdk:
next: true
zowe-v1-lts: 4.0.11
zowe-v2-lts: 5.0.6
zowe-v3-lts: 6.0.0
zowe-v3-lts: 6.2.4
cics-for-zowe-cli:
next: true
zowe-v1-lts: 4.0.11
zowe-v2-lts: 5.0.6
zowe-v3-lts: 6.0.0
zowe-v3-lts: 6.2.4
db2-for-zowe-cli:
next: true
zowe-v1-lts: 4.1.15
zowe-v2-lts: 5.0.9
zowe-v3-lts: 6.0.0
zowe-v3-lts: 6.1.0
ims-for-zowe-cli:
next: true
zowe-v1-lts: 2.0.5
Expand All @@ -116,7 +116,6 @@ packages:
zowe-v1-lts: 1.8.8
zowe-v2-lts: 2.1.9
zowe-v3-lts: 3.0.0

# Define extra @zowe-scoped packages that are not included in the Zowe bundle.
# These packages will be mirrored from Artifactory to npmjs.org nightly.
extras:
Expand All @@ -129,7 +128,6 @@ extras:
zowe-v2-lts: true
secrets-for-kubernetes-for-zowe-cli:
next: true

# Define version info for the latest staged Zowe release.
tags:
zowe-v1-lts:
Expand All @@ -139,8 +137,8 @@ tags:
version: 2.18.0
rc: 6
zowe-v3-lts:
version: 3.0.0
rc: 2
version: 3.1.0
rc: 1
# next:
# version: 2.0.0
# snapshot: '2022-04-15'

0 comments on commit 4d4f2af

Please sign in to comment.