Updated release action to use ssh with the repository, add latest loc…

…ation for the scripts to the README
saltstack · Dec 5, 2024 · 89003e6 · 89003e6
1 parent bffb260
commit 89003e6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 25 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -99,7 +99,7 @@ jobs:
       - name: Push Changes
         uses: ad-m/github-push-action@b87afee92c6e70ea888be6203a3e9426fda49839
         with:
-          ## ssh: true
+          ssh: true
           atomic: true
           branch: main
           repository: ${{ github.repository }}
@@ -126,7 +126,7 @@ jobs:
         with:
           ref: main
           repository: ${{ github.repository }}
-          ## ssh-key: ${{ secrets.SALT_VMTOOLS_RELEASE_KEY }}
+          ssh-key: ${{ secrets.SALT_VMTOOLS_RELEASE_KEY }}
 
       - name: Configure Git
         shell: bash
@@ -146,6 +146,24 @@ 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: |
+          sha256sum linux/svtminion.sh | awk '{ print $1 }' > svtminion.sh.sha256
+          sha256sum windows/svtminion.ps1 | awk '{ print $1 }' > svtminion.ps1.sha256
+          ls -alh
+          git add svtminion.sh.sha256
+          git add svtminion.ps1.sha256
+          git commit -am "Update sha256 checksums" || git commit -am "Update sha256 checksums"
+
+      - name: Push Changes
+        uses: ad-m/github-push-action@b87afee92c6e70ea888be6203a3e9426fda49839
+        with:
+          ssh: true
+          tags: true
+          atomic: true
+          branch: main
+          repository: ${{ github.repository }}
+
       - name: Tag The ${{ needs.update-main.outputs.release-version }} Release
         run: |
           git tag -f --no-sign -m "Release ${{ needs.update-main.outputs.release-version }}" -a ${{ needs.update-main.outputs.release-version }}
@@ -163,6 +181,8 @@ jobs:
           files: |
             linux/svtminion.sh
             windows/svtminion.ps1
+            svtminion.sh.sha256
+            svtminion.ps1.sha256
             LICENSE
 
       - name: Delete Release Details Artifact
@@ -186,7 +206,7 @@ jobs:
         with:
           ref: main
           repository: ${{ github.repository }}
-          ## ssh-key: ${{ secrets.SALT_VMTOOLS_RELEASE_KEY }}
+          ssh-key: ${{ secrets.SALT_VMTOOLS_RELEASE_KEY }}
 
       - name: Get linux/svtminion.sh on main branch sha256sum
         run: |
@@ -197,7 +217,7 @@ jobs:
         with:
           ref: main
           repository: ${{ github.repository }}
-          ## ssh-key: ${{ secrets.SALT_VMTOOLS_RELEASE_KEY }}
+          ssh-key: ${{ secrets.SALT_VMTOOLS_RELEASE_KEY }}
 
       - name: Configure Git
         shell: bash
@@ -224,25 +244,7 @@ jobs:
       - name: Push Changes
         uses: ad-m/github-push-action@b87afee92c6e70ea888be6203a3e9426fda49839
         with:
-          ## ssh: true
-          atomic: true
-          branch: main
-          repository: ${{ github.repository }}
-
-      - name: Update linux/svtminion.sh sha256sum's
-        run: |
-          sha256sum linux/svtminion.sh | awk '{ print $1 }' > svtminion.sh.sha256
-          sha256sum windows/svtminion.ps1 | awk '{ print $1 }' > svtminion.ps1.sha256
-          ls -alh
-          git add svtminion.sh.sha256
-          git add svtminion.ps1.sha256
-          git commit -am "Update sha256 checksums" || git commit -am "Update sha256 checksums"
-
-      - name: Push Changes
-        uses: ad-m/github-push-action@b87afee92c6e70ea888be6203a3e9426fda49839
-        with:
-          ## ssh: true
-          tags: true
+          ssh: true
           atomic: true
           branch: main
           repository: ${{ github.repository }}
diff --git a/README.md b/README.md
@@ -26,11 +26,15 @@ The SHA256 sum of the `svtminion.sh` file, per release, is:
 
 If you're looking for a *one-liner* to install Salt Minion, please read below.
 
-There are also .sha256 files for verifying against in the repo for the main branch.  You can also
-get the correct sha256 sum for the tagged release from
+There are also .sha256 files for verifying against in the repo for the main branch.
+You can also get the correct sha256 sum for the tagged release from
 https://github.com/saltstack/salt-vmtools/releases/latest/download/svtminion.sh.sha256 and
 https://github.com/saltstack/salt-vmtools/releases/latest/download/svtminion.ps1.sha256
 
+The latest versions of the svtminion scripts for Linux and Windows from the following
+https://github.com/saltstack/salt-vmtools/releases/latest/download/svtminion.sh and
+https://github.com/saltstack/salt-vmtools/releases/latest/download/svtminion.ps1
+
 
 ## Configuration options