Merge develop into stable for v2022.08.13 release

.github/workflows/ci.yml

@@ -39,6 +39,19 @@ jobs:
         run: |
           echo "::set-output name=run-tests::${{ steps.changed-files.outputs.any_modified }}"
 
+      - name: Set Exit Status
+        if: always()
+        run: |
+          mkdir exitstatus
+          echo "${{ job.status }}" > exitstatus/${{ github.job }}
+
+      - name: Upload Exit Status
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: exitstatus
+          path: exitstatus
+
   generate-actions-workflow:
     name: Generate The Actions Workflow
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -112,16 +112,17 @@ jobs:
 
       - name: Merge develop into stable
         run: |
-          git merge --no-ff -m "Merge develop into stable" origin/develop || touch .git-conflicts
+          git merge --no-ff -m "Merge develop into stable for ${CUT_RELEASE_VERSION} release" origin/develop || touch .git-conflicts
           if [ -f .git-conflicts ]
           then
             git diff
             for f in $(git status | grep 'both modified' | awk '{ print $3 }')
             do
               git checkout --theirs $f
+              pre-commit run -av --files $f
               git add $f
             done
-            git commit -a -m "Merge develop into stable(auto resolving conflicts to the develop version)"
+            git commit -a -m "Merge develop into stable for ${CUT_RELEASE_VERSION} release(auto resolving conflicts to the develop version)"
           fi
 
       - name: Tag Release
@@ -132,6 +133,12 @@ jobs:
           tag_prefix: ""
           create_annotated_tag: true
 
+      - name: Update bootstrap-salt.sh sha256sum's
+        run: |
+          echo "$(sha256sum bootstrap-salt.sh | awk '{ print $1 }')" > bootstrap-salt.sh.sha256
+          echo "$(sha256sum bootstrap-salt.ps1 | awk '{ print $1 }')" > bootstrap-salt.ps1.sha256
+          git commit -a -m "Update sha256 checksums" || git commit -a -m "Update sha256 checksums"
+
       - name: Push Changes
         uses: ad-m/github-push-action@master
         with:
@@ -176,7 +183,9 @@ jobs:
           generate_release_notes: false
           files: |
             bootstrap-salt.sh
+            bootstrap-salt.sh.sha256
             bootstrap-salt.ps1
+            bootstrap-salt.ps1.sha256
             LICENSE
 
       - name: Delete Release Details Artifact

.github/workflows/templates/ci.yml

@@ -39,6 +39,19 @@ jobs:
         run: |
           echo "::set-output name=run-tests::${{ steps.changed-files.outputs.any_modified }}"
 
+      - name: Set Exit Status
+        if: always()
+        run: |
+          mkdir exitstatus
+          echo "${{ job.status }}" > exitstatus/${{ github.job }}
+
+      - name: Upload Exit Status
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: exitstatus
+          path: exitstatus
+
   generate-actions-workflow:
     name: Generate The Actions Workflow
     runs-on: ubuntu-latest

.github/workflows/test-windows.yml

@@ -87,8 +87,7 @@ jobs:
 
       - name: Create Test Instance
         run: |
-          bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }} || \
+          bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }}
-            (sleep 10 && bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }})
 
       - name: Test Bootstrap
         run: |

CHANGELOG.md

@@ -1,3 +1,21 @@
+# v2022.08.13
+
+## What's Changed
+
+- Fix test-windows workflow powershell syntax & Run pre-commit when resolving conflicts on the release workflow by @s0undt3ch in https://github.com/saltstack/salt-bootstrap/pull/1857
+- Update `*.sha256` files when merging develop into stable by @s0undt3ch in https://github.com/saltstack/salt-bootstrap/pull/1859
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2022.08.12...v2022.08.13
+
+# v2022.08.13
+
+## What's Changed
+
+- Fix test-windows workflow powershell syntax & Run pre-commit when resolving conflicts on the release workflow by @s0undt3ch in https://github.com/saltstack/salt-bootstrap/pull/1857
+- Update `*.sha256` files when merging develop into stable by @s0undt3ch in https://github.com/saltstack/salt-bootstrap/pull/1859
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2022.08.12...v2022.08.13
+
 # v2022.08.12
 
 ## What's Changed

README.rst

@@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+- 2022.08.12: ``b46f018bbf02f45c6096ab96e9261a9adb3a78ff65092c3976f32ffde909afcb``
 - 2022.05.19: ``e92e1df6930285cf23eda188bee3cfa3dd6c577b4fb7aa91b29213ad820199b1``
 - 2022.03.15: ``8f65952c3435f441e7f793941d5162d3ec2033a9ef82722ff1da67a2ef860a2f``
 - 2021.09.17: ``090d652cd6290debce0e3a4eded65086a4272e69446e711eb26f87160593b6a2``

bootstrap-salt.sh

@@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2022.08.12"
+__ScriptVersion="2022.08.13"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"