Merge develop into stable for v2024.07.12 release

saltstack · Jul 12, 2024 · 67e0c05 · 67e0c05
2 parents cbcbd3c + aae98db
commit 67e0c05
Show file tree

Hide file tree

Showing 25 changed files with 1,281 additions and 3,726 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/scripts/cut-release.py b/.github/workflows/scripts/cut-release.py
@@ -188,6 +188,7 @@ def main():
         + changelog_file.read_text()
     )
 
+    # Update Script Version for the bash script
     bootstrap_script_path = REPO_ROOT / "bootstrap-salt.sh"
     print(
         f"* Updating {bootstrap_script_path.relative_to(REPO_ROOT)} ...",
@@ -201,6 +202,22 @@ def main():
             bootstrap_script_path.read_text(),
         )
     )
+
+    # Update the Script Version for the powershell script
+    bootstrap_script_path = REPO_ROOT / "bootstrap-salt.ps1"
+    print(
+        f"* Updating {bootstrap_script_path.relative_to(REPO_ROOT)} ...",
+        file=sys.stderr,
+        flush=True,
+    )
+    bootstrap_script_path.write_text(
+        re.sub(
+            r'\$__ScriptVersion = "(.*)"',
+            f'$__ScriptVersion = "{options.release_tag.lstrip("v")}"',
+            bootstrap_script_path.read_text(),
+        )
+    )
+
     parser.exit(status=0, message="CHANGELOG.md and bootstrap-salt.sh updated\n")
 
 

diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
@@ -11,7 +11,7 @@
 
       - name: Download Exit Status Files
         if: always()
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: exitstatus
           path: exitstatus

diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
@@ -61,10 +61,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Install Pre-Commit
         run: |
@@ -84,7 +84,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
@@ -93,7 +93,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     needs: collect-changed-files
-    container: koalaman/shellcheck-alpine:v0.7.0
+    container: koalaman/shellcheck-alpine:latest
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
       - uses: actions/checkout@v4
@@ -109,7 +109,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus