From 5228a12b1fcde21a026ebfcb965b9e1562d2a5ab Mon Sep 17 00:00:00 2001
From: "github-actions[bot] on behalf of @s0undt3ch"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Aug 2022 13:03:50 +0000
Subject: [PATCH 1/8] Update README.rst with 2022.08.12 release sha256sum

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index da4bc95..c70071a 100644
--- a/README.rst
+++ b/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``

From 8c167920776f69fa40bd563c406dc7c509fcc6d4 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Fri, 12 Aug 2022 16:51:04 +0100
Subject: [PATCH 2/8] It's powershell on windows...

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 .github/workflows/test-windows.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index c034c9d..70b5661 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -87,8 +87,7 @@ jobs:
 
       - name: Create Test Instance
         run: |
-          bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }} || \
-            (sleep 10 && bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }})
+          bundle exec kitchen create ${{ matrix.instance }}-${{ inputs.distro-slug }}
 
       - name: Test Bootstrap
         run: |

From d19191838f1564a64cb5158fe1c740a8d99be382 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Fri, 12 Aug 2022 17:43:33 +0100
Subject: [PATCH 3/8] Run pre-commit on conflict files before adding them

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1f5a6d0..a40e74f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -119,6 +119,7 @@ jobs:
             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)"

From f414341b6746fb04c315aade604a2bb4ef0a6447 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Sat, 13 Aug 2022 21:05:28 +0100
Subject: [PATCH 4/8] Update `*.sha256` files when merging develop into stable

Fixes #1858

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 .github/workflows/release.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a40e74f..7daf660 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -112,7 +112,7 @@ 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
@@ -122,7 +122,7 @@ jobs:
               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
@@ -133,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 commmit -a -m "Update sha256 checksums" || git commmit -a -m "Update sha256 checksums"
+
       - name: Push Changes
         uses: ad-m/github-push-action@master
         with:
@@ -177,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

From 273bc1f106cd77662df11f1e6283fb7a0df8ca78 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Sat, 13 Aug 2022 21:10:45 +0100
Subject: [PATCH 5/8] The main job should also set the exit status

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 .github/workflows/ci.yml           | 13 +++++++++++++
 .github/workflows/templates/ci.yml | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2f2df5..750f6ee 100644
--- a/.github/workflows/ci.yml
+++ b/.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
diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
index 1982b9f..96d3bb6 100644
--- a/.github/workflows/templates/ci.yml
+++ b/.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

From ec905ffc2a4ebcdd70782c863a7f40d48df74824 Mon Sep 17 00:00:00 2001
From: "github-actions[bot] on behalf of s0undt3ch"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 Aug 2022 20:19:13 +0000
Subject: [PATCH 6/8] Update develop branch for the v2022.08.13 release

---
 CHANGELOG.md      | 9 +++++++++
 bootstrap-salt.sh | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc0fabe..2b06e7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 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
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 7537a09..19e4124 100755
--- a/bootstrap-salt.sh
+++ b/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"

From 449c65179b1f99304fe2605b7bc7799693d8ed2a Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Sat, 13 Aug 2022 22:16:17 +0100
Subject: [PATCH 7/8] Typo

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7daf660..2f6550c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -137,7 +137,7 @@ jobs:
         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 commmit -a -m "Update sha256 checksums" || git commmit -a -m "Update sha256 checksums"
+          git commit -a -m "Update sha256 checksums" || git commit -a -m "Update sha256 checksums"
 
       - name: Push Changes
         uses: ad-m/github-push-action@master

From 541c4bd41f02bf11ffb366e6b2492d507a45bf91 Mon Sep 17 00:00:00 2001
From: "github-actions[bot] on behalf of s0undt3ch"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 Aug 2022 21:18:07 +0000
Subject: [PATCH 8/8] Update develop branch for the v2022.08.13 release

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b06e7e..15dbb0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,15 @@
 
 **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