Merge pull request #15 from dmurphy18/fix_cut_release_6

Corrected paths to scripts and moved location tag occurs
saltstack · Dec 4, 2024 · 6e2f07c · 6e2f07c
2 parents b690d0c + 3abc530
commit 6e2f07c
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -201,6 +201,11 @@ jobs:
           CUT_RELEASE_VERSION=$(cat .cut_release_version)
           echo "CUT_RELEASE_VERSION=${CUT_RELEASE_VERSION}" >> "$GITHUB_ENV"
 
+      - name: Tag The ${{ needs.update-main.outputs.release-version }} Release
+        run: |
+          ## DGM git tag --no-sign -m "Release ${{ needs.update-main.outputs.release-version }}" -a ${{ needs.update-main.outputs.release-version }}
+          git tag -f --no-sign -m "Release ${{ needs.update-main.outputs.release-version }}" -a ${{ needs.update-main.outputs.release-version }}
+
       - name: Create Github Release
         uses: softprops/action-gh-release@v1
         with:
@@ -212,8 +217,8 @@ jobs:
           prerelease: false
           generate_release_notes: false
           files: |
-            svtminion.sh
-            svtminion.ps1
+            linux/svtminion.sh
+            windows/svtminion.ps1
             LICENSE
 
       - name: Delete Release Details Artifact
@@ -241,8 +246,9 @@ jobs:
 
       - name: Get vmtools-salt.sh on main branch sha256sum
         run: |
-          echo "SH=$(sha256sum vmtools-salt.sh | awk '{ print $1 }')" >> "$GITHUB_ENV"
-          echo "VMTS_VERSION=$(sh vmtools-salt.sh -v | awk '{ print $4 }')" >> "$GITHUB_ENV"
+          echo "SH=$(sha256sum linux/vmtools-salt.sh | awk '{ print $1 }')" >> "$GITHUB_ENV"
+          echo "VMTS_VERSION=$(sh linux/vmtools-salt.sh --version | awk '{ print $4 }')" >> "$GITHUB_ENV"
+          echo "DGM  SH ,${SH}, and VMTS_VERSION ,${VMTS_VERSION},"
 
       - uses: actions/checkout@v4
         with:
@@ -269,8 +275,8 @@ jobs:
 
       - name: Commit Changes
         run: |
-          git commit -am "Update README.rst with ${{ env.VMTS_VERSION }} release sha256sum" || \
-            git commit -am "Update README.rst with ${{ env.VMTS_VERSION }} release sha256sum"
+          git commit -am "Update README.md with ${{ env.VMTS_VERSION }} release sha256sum" || \
+            git commit -am "Update README.md with ${{ env.VMTS_VERSION }} release sha256sum"
 
       - name: Push Changes
         uses: ad-m/github-push-action@b87afee92c6e70ea888be6203a3e9426fda49839
@@ -282,8 +288,8 @@ jobs:
 
       - name: Update vmtools-salt.sh sha256sum's
         run: |
-          sha256sum vmtools-salt.sh | awk '{ print $1 }' > vmtools-salt.sh.sha256
-          sha256sum vmtools-salt.ps1 | awk '{ print $1 }' > vmtools-salt.ps1.sha256
+          sha256sum linux/svtminion.sh | awk '{ print $1 }' > svtminion.sh.sha256
+          sha256sum windows/svtminion.ps1 | awk '{ print $1 }' > svtminion.ps1.sha256
           git commit -a -m "Update sha256 checksums" || git commit -a -m "Update sha256 checksums"
 
       - name: Push Changes
@@ -294,7 +300,3 @@ jobs:
           atomic: true
           branch: main
           repository: ${{ github.repository }}
-
-      - name: Tag The ${{ needs.update-main.outputs.release-version }} Release
-        run: |
-          git tag --no-sign -m "Release ${{ needs.update-main.outputs.release-version }}" -a ${{ needs.update-main.outputs.release-version }}