Merge pull request #276 from zowe/v2.18.0/master

Update master branch with 2.18 RC changes
zowe · Aug 27, 2024 · 214feee · 214feee
2 parents c6d3633 + 08fc327
commit 214feee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/zowe-cli-bundle.yaml b/.github/workflows/zowe-cli-bundle.yaml
@@ -138,7 +138,7 @@ jobs:
         mkdir -p temp && cd temp
         mkdir -p licenses && cd licenses && cp /tmp/zowe_licenses_cli.zip zowe_licenses_cli.zip && cd ..
         if [[ "${{ inputs.package-tag }}" != "zowe-v1-lts" ]]; then
-          pip3 download --no-binary charset-normalizer,pyrsistent,pyyaml --pre zowe
+          pip3 download --no-binary charset-normalizer,pyrsistent,pyyaml --pre zowe-python-sdk-bundle
           # Download Secrets SDK binary wheels for all platforms
           curl -fs https://pypi.org/project/zowe-secrets-for-zowe-sdk/#files |
             grep -Eo 'href="[^"]+\.whl"' | cut -d '"' -f 2 |

diff --git a/.github/workflows/zowe-versions_updateVersions_createPR.yml b/.github/workflows/zowe-versions_updateVersions_createPR.yml
@@ -55,7 +55,7 @@ jobs:
           done
 
           # Update zowe-versions.yaml tags section (always sets rc = 1)
-          sed -i -E "/$zowe_version:/ { n; s/(version: ).*/\1$version/; s/(rc: )[0-9]+/\11/ }" zowe-versions.yaml
+          sed -i -E "/$zowe_version:/ { n; s/(version: ).*/\1$version/; n; s/(rc: )[0-9]+/\11/ }" zowe-versions.yaml
 
 
       - name: Commit and Push Changes

diff --git a/zowe-versions.yaml b/zowe-versions.yaml
@@ -71,7 +71,7 @@ packages:
     zowe-v1-lts: 6.40.28
     next: true
   cli:
-    zowe-v2-lts: 7.29.0
+    zowe-v2-lts: 7.29.1
     zowe-v1-lts: 6.40.28
     next: true
   # CLI plug-ins
@@ -123,7 +123,7 @@ tags:
     rc: 1
   zowe-v2-lts:
     version: 2.18.0
-    rc: 3
+    rc: 6
   # next:
   #   version: 2.0.0
   #   snapshot: '2022-04-15'