Update version without committing to main

Author: twangboy

.github/workflows/release.yml

@@ -146,13 +146,17 @@ jobs:
           CUT_RELEASE_VERSION=$(cat .cut_release_version)
           echo "CUT_RELEASE_VERSION=${CUT_RELEASE_VERSION}" >> "$GITHUB_ENV"
 
-      - name: Update linux/svtminion.sh sha256sum's
-        run: |
-          (cd linux && sha256sum svtminion.sh > ../svtminion.sh.sha256)
-          (cd windows && sha256sum svtminion.ps1 > ../svtminion.ps1.sha256)
-          git add svtminion.sh.sha256
-          git add svtminion.ps1.sha256
-          git commit --allow-empty -am "Update sha256 checksums" || git commit --allow-empty -am "Update sha256 checksums"
+      - name: Prepare release artifacts
+        run: |
+          mkdir -p dist
+          cp linux/svtminion.sh dist/svtminion.sh
+          cp windows/svtminion.ps1 dist/svtminion.ps1
+          # Inject release version into artifact copies (strip leading 'v')
+          sed -E -i "s/^readonly SCRIPT_VERSION=\".*\"$/readonly SCRIPT_VERSION=\"${CUT_RELEASE_VERSION#v}\"/" dist/svtminion.sh
+          sed -E -i "s/^\$SCRIPT_VERSION = \".*\"$/\$SCRIPT_VERSION = \"${CUT_RELEASE_VERSION#v}\"/" dist/svtminion.ps1
+          # Generate checksums for the release artifacts
+          (cd dist && sha256sum svtminion.sh > ../svtminion.sh.sha256)
+          (cd dist && sha256sum svtminion.ps1 > ../svtminion.ps1.sha256)
 
       - name: Tag The ${{ needs.update-main.outputs.release-version }} Release
         run: |
@@ -169,8 +173,8 @@ jobs:
           prerelease: false
           generate_release_notes: false
           files: |
-            linux/svtminion.sh
-            windows/svtminion.ps1
+            dist/svtminion.sh
+            dist/svtminion.ps1
             svtminion.sh.sha256
             svtminion.ps1.sha256
             LICENSE
@@ -185,6 +189,7 @@ jobs:
     name: Update Release Checksums on Main
     runs-on: ubuntu-latest
     needs:
+      - update-main
       - publish-release
     environment: release
     permissions:
@@ -198,17 +203,6 @@ jobs:
           repository: ${{ github.repository }}
           ssh-key: ${{ secrets.SALT_VMTOOLS_RELEASE_KEY }}
 
-      - name: Get linux/svtminion.sh on main branch sha256sum
-        run: |
-          echo "SH=$(sha256sum linux/svtminion.sh | awk '{ print $1 }')" >> "$GITHUB_ENV"
-          echo "VMTS_VERSION=$(bash linux/svtminion.sh --version | awk '{ print $1 }')" >> "$GITHUB_ENV"
-
-      - uses: actions/checkout@v6
-        with:
-          ref: main
-          repository: ${{ github.repository }}
-          ssh-key: ${{ secrets.SALT_VMTOOLS_RELEASE_KEY }}
-
       - name: Configure Git
         shell: bash
         run: |
@@ -218,8 +212,12 @@ jobs:
           git config --global commit.gpgsign false
 
       - name: Update Latest Release on README
+        shell: bash
         run: |
-          python3 .github/workflows/scripts/update-release-shasum.py ${{ env.VMTS_VERSION }} ${{ env.SH }}
+          VERSION="${{ needs.update-main.outputs['release-version'] }}"
+          SH="$(sha256sum linux/svtminion.sh | awk '{ print $1 }')"
+          echo "Updating README with version '${VERSION}' and sha '${SH}'"
+          python3 .github/workflows/scripts/update-release-shasum.py "$VERSION" "$SH"
 
       - name: Show Changes
         run: |

.github/workflows/scripts/cut-release.py

@@ -188,37 +188,7 @@ def main():
         + changelog_file.read_text()
     )
 
-    # Update Script Version for the bash script
-    svtminion_script_path = REPO_ROOT / "linux/svtminion.sh"
-    print(
-        f"* Updating {svtminion_script_path.relative_to(REPO_ROOT)} ...",
-        file=sys.stderr,
-        flush=True,
-    )
-    svtminion_script_path.write_text(
-        re.sub(
-            r'readonly SCRIPT_VERSION="(.*)"',
-            f'readonly SCRIPT_VERSION="{options.release_tag.lstrip("v")}"',
-            svtminion_script_path.read_text(),
-        )
-    )
-
-    # Update the Script Version for the powershell script
-    svtminion_script_path = REPO_ROOT / "windows/svtminion.ps1"
-    print(
-        f"* Updating {svtminion_script_path.relative_to(REPO_ROOT)} ...",
-        file=sys.stderr,
-        flush=True,
-    )
-    svtminion_script_path.write_text(
-        re.sub(
-            r'\$SCRIPT_VERSION = "(.*)"',
-            f'$SCRIPT_VERSION = "{options.release_tag.lstrip("v")}"',
-            svtminion_script_path.read_text(),
-        )
-    )
-
-    parser.exit(status=0, message="CHANGELOG.md and svtminion.sh updated\n")
+    parser.exit(status=0, message="CHANGELOG.md and release metadata updated\n")
 
 
 if __name__ == "__main__":

linux/svtminion.sh

@@ -19,7 +19,7 @@ set -o pipefail
 # using bash for now
 # run this script as root, as needed to run Salt
 
-readonly SCRIPT_VERSION="2026.03.13"
+readonly SCRIPT_VERSION="SCRIPT_VERSION_REPLACE"
 
 # definitions
 

windows/svtminion.ps1

@@ -287,7 +287,7 @@ if ($help) {
 }
 
 # This value is populated via CICD during build
-$SCRIPT_VERSION = "2026.03.13"
+$SCRIPT_VERSION = "SCRIPT_VERSION_REPLACE"
 if ($Version) {
     Write-Host $SCRIPT_VERSION
     exit 0