From 8166b71854e9eab5056b791dff8ff7e7ecfc4b6e Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Fri, 12 Jul 2024 15:25:03 +0000
Subject: [PATCH 01/14] Update README.rst with 2024.07.12 release sha256sum

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

diff --git a/README.rst b/README.rst
index 242428664..df9fb30c9 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:
 
+- 2024.07.12: ``526f4a5383db308081a120e26988679238ca6add4bf7a82120cbe71d57ab826e``
 - 2024.04.03: ``450ba5cde4af8d6cb5c56c66791f87b918bcda70ccdfb10abf3cc294143c8073``
 - 2024.01.04: ``cebcbc67895e238d1cf0024922a7fe5c772b9aaba346490c8fa6193bb0d993d4``
 - 2023.11.16: ``3757ed82161113fed4c711fd7332e922265eeeb54e6e4f657a08ea82d57cc3a2``

From 272ed35db8e70e2db4c3133337e472674d394540 Mon Sep 17 00:00:00 2001
From: Andrii Melashchenko <6060861+javatask@users.noreply.github.com>
Date: Mon, 15 Jul 2024 10:33:54 +0200
Subject: [PATCH 02/14] Update bootstrap-salt.sh

On arm64 platforms, bootstrap fails to finish installation due to missing variable 'error_msg=""' in case statement.
This change adds a single line to fix the bug.
---
 bootstrap-salt.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 23052e99d..ec07b9c80 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1389,6 +1389,7 @@ __check_dpkg_architecture() {
             ;;
         "arm64")
             # Saltstack official repository has full arm64 support since 3006
+            error_msg=""
             __REPO_ARCH="arm64"
             __REPO_ARCH_DEB="deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=$__REPO_ARCH]"
             ;;

From bb8d8a892dfac534ee92e26cb7e4d53c9946445c Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 12 Jul 2024 11:11:36 -0600
Subject: [PATCH 03/14] Updated GitHunb actions to later v4

---
 .github/workflows/ci.yml                |  8 ++++----
 .github/workflows/nightly.yml           |  2 +-
 .github/workflows/release.yml           | 18 +++++++++---------
 .github/workflows/templates/ci-tail.yml |  2 +-
 .github/workflows/templates/ci.yml      |  6 +++---
 .github/workflows/test-linux.yml        |  4 ++--
 .github/workflows/test-macos.yml        |  4 ++--
 .github/workflows/test-windows.yml      |  4 ++--
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9c4e9cfb9..2b4a2f72f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
@@ -84,7 +84,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
@@ -109,7 +109,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
@@ -525,7 +525,7 @@ jobs:
 
       - name: Download Exit Status Files
         if: always()
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index d04378611..bfdb47b13 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -54,7 +54,7 @@ jobs:
     environment: release
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get Salt Project GitHub Actions Bot Environment
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8a18b485a..1c7ef66d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -63,7 +63,7 @@ jobs:
     outputs:
       release-version: ${{ steps.update-repo.outputs.release-version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: develop
           repository: ${{ github.repository }}
@@ -139,7 +139,7 @@ jobs:
           repository: ${{ github.repository }}
 
       - name: Upload Release Details
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release-details
           path: |
@@ -158,7 +158,7 @@ jobs:
     permissions:
       contents: write  # To be able to publish the release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -205,7 +205,7 @@ jobs:
           git config --global commit.gpgsign true
 
       - name: Download Release Details
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: release-details
 
@@ -254,13 +254,13 @@ jobs:
     permissions:
       contents: write  # To be able to publish the release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: stable
           repository: ${{ github.repository }}
           ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }}
       - name: Download Release Details
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: release-details
 
@@ -303,7 +303,7 @@ jobs:
     environment: release
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -367,7 +367,7 @@ jobs:
       pull-requests: write  # For action peter-evans/create-pull-request
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -378,7 +378,7 @@ jobs:
           echo "SH=$(sha256sum bootstrap-salt.sh | awk '{ print $1 }')" >> "$GITHUB_ENV"
           echo "BS_VERSION=$(sh bootstrap-salt.sh -v | awk '{ print $4 }')" >> "$GITHUB_ENV"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: develop
           repository: ${{ github.repository }}
diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
index e811d7fb7..da692ed87 100644
--- a/.github/workflows/templates/ci-tail.yml
+++ b/.github/workflows/templates/ci-tail.yml
@@ -11,7 +11,7 @@
 
       - name: Download Exit Status Files
         if: always()
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
index 0f292d301..c733ffe83 100644
--- a/.github/workflows/templates/ci.yml
+++ b/.github/workflows/templates/ci.yml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
@@ -84,7 +84,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
@@ -109,7 +109,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index dca430ac5..9c5420450 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -35,7 +35,7 @@ jobs:
         instance: ${{ fromJSON(inputs.instances) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -78,7 +78,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 425b158ef..b61c05bfb 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -42,7 +42,7 @@ jobs:
         instance: ${{ fromJSON(inputs.instances) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -86,7 +86,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 09eda400b..1120fd83b 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -45,7 +45,7 @@ jobs:
         instance: ${{ fromJSON(inputs.instances) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -115,7 +115,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: exitstatus
           path: exitstatus

From 4554169a6aa69c2aaf791c804bade6fe63c4f12f Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 12 Jul 2024 11:49:20 -0600
Subject: [PATCH 04/14] Adjust actions upload-artifact

---
 .github/workflows/release.yml      | 2 +-
 .github/workflows/test-linux.yml   | 2 +-
 .github/workflows/test-macos.yml   | 2 +-
 .github/workflows/test-windows.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1c7ef66d3..3dea10ea6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -139,7 +139,7 @@ jobs:
           repository: ${{ github.repository }}
 
       - name: Upload Release Details
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: release-details
           path: |
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 9c5420450..6616c7f42 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -78,7 +78,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index b61c05bfb..2590a73de 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -86,7 +86,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 1120fd83b..0c64b2a71 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -115,7 +115,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: exitstatus
           path: exitstatus

From 4637ef086356f8bb49af906a82bc4edcdf7cac17 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 12 Jul 2024 13:51:24 -0600
Subject: [PATCH 05/14] Adjust delete-artifact version

---
 .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 3dea10ea6..2d92580f5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -287,7 +287,7 @@ jobs:
             LICENSE
 
       - name: Delete Release Details Artifact
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v4
         with:
           name: release-details
           failOnError: false

From 79264af6eb4d968edce4823385148aa18b7d70a1 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 12 Jul 2024 14:40:41 -0600
Subject: [PATCH 06/14] Revert delete-artifact for release

---
 .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 2d92580f5..3dea10ea6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -287,7 +287,7 @@ jobs:
             LICENSE
 
       - name: Delete Release Details Artifact
-        uses: geekyeggo/delete-artifact@v4
+        uses: geekyeggo/delete-artifact@v2
         with:
           name: release-details
           failOnError: false

From 0daa3c47d119b973a83f1fcdc98c77a88e531a5c Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 12 Jul 2024 15:10:30 -0600
Subject: [PATCH 07/14] Revert download-artifact for release

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3dea10ea6..36661ea12 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -205,7 +205,7 @@ jobs:
           git config --global commit.gpgsign true
 
       - name: Download Release Details
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: release-details
 
@@ -260,7 +260,7 @@ jobs:
           repository: ${{ github.repository }}
           ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }}
       - name: Download Release Details
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: release-details
 

From b36f307bbcb2d714d85b617f02438d6f2faed451 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Fri, 12 Jul 2024 15:43:24 -0600
Subject: [PATCH 08/14] Readjust some action values

---
 .github/workflows/nightly.yml      |  2 +-
 .github/workflows/release.yml      | 12 ++++++------
 .github/workflows/test-linux.yml   |  1 +
 .github/workflows/test-windows.yml |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index bfdb47b13..d04378611 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -54,7 +54,7 @@ jobs:
     environment: release
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Get Salt Project GitHub Actions Bot Environment
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 36661ea12..8a18b485a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -63,7 +63,7 @@ jobs:
     outputs:
       release-version: ${{ steps.update-repo.outputs.release-version }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: develop
           repository: ${{ github.repository }}
@@ -158,7 +158,7 @@ jobs:
     permissions:
       contents: write  # To be able to publish the release
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -254,7 +254,7 @@ jobs:
     permissions:
       contents: write  # To be able to publish the release
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -303,7 +303,7 @@ jobs:
     environment: release
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -367,7 +367,7 @@ jobs:
       pull-requests: write  # For action peter-evans/create-pull-request
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: stable
           repository: ${{ github.repository }}
@@ -378,7 +378,7 @@ jobs:
           echo "SH=$(sha256sum bootstrap-salt.sh | awk '{ print $1 }')" >> "$GITHUB_ENV"
           echo "BS_VERSION=$(sh bootstrap-salt.sh -v | awk '{ print $4 }')" >> "$GITHUB_ENV"
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: develop
           repository: ${{ github.repository }}
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 6616c7f42..6c74df823 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -56,6 +56,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 }})
           sleep 2
 
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 0c64b2a71..09eda400b 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -45,7 +45,7 @@ jobs:
         instance: ${{ fromJSON(inputs.instances) }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1

From 69a5a7c79c1cb29186051b9674b3bd4b4cd78b95 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 15 Jul 2024 10:19:06 -0600
Subject: [PATCH 09/14] Reverting to download-artifact v3, to debug exit
 pipeline failure

---
 .github/workflows/ci.yml                | 2 +-
 .github/workflows/templates/ci-tail.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b4a2f72f..def94a387 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -525,7 +525,7 @@ jobs:
 
       - name: Download Exit Status Files
         if: always()
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
index da692ed87..e811d7fb7 100644
--- a/.github/workflows/templates/ci-tail.yml
+++ b/.github/workflows/templates/ci-tail.yml
@@ -11,7 +11,7 @@
 
       - name: Download Exit Status Files
         if: always()
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: exitstatus
           path: exitstatus

From 9ef40698b0c95a72a70e76aaeb82788ebbf1b14f Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 15 Jul 2024 11:31:07 -0600
Subject: [PATCH 10/14] Debugging pipeline exit failure

---
 .github/workflows/ci.yml                | 4 ++--
 .github/workflows/templates/ci-tail.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index def94a387..51160a9e5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -525,14 +525,14 @@ jobs:
 
       - name: Download Exit Status Files
         if: always()
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
 
       - name: Delete Exit Status Artifacts
         if: always()
-        uses: geekyeggo/delete-artifact@v4
+        uses: geekyeggo/delete-artifact@v3
         with:
           name: exitstatus
           failOnError: false
diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
index e811d7fb7..ff676ce90 100644
--- a/.github/workflows/templates/ci-tail.yml
+++ b/.github/workflows/templates/ci-tail.yml
@@ -11,14 +11,14 @@
 
       - name: Download Exit Status Files
         if: always()
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: exitstatus
           path: exitstatus
 
       - name: Delete Exit Status Artifacts
         if: always()
-        uses: geekyeggo/delete-artifact@v4
+        uses: geekyeggo/delete-artifact@v3
         with:
           name: exitstatus
           failOnError: false

From a52ba3b64dc9deaf59bbc33fac8f43745eb467a0 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 15 Jul 2024 14:00:21 -0600
Subject: [PATCH 11/14] Trying earlier version of delete-artifact

---
 .github/workflows/ci.yml                | 2 +-
 .github/workflows/templates/ci-tail.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51160a9e5..3a1569762 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -532,7 +532,7 @@ jobs:
 
       - name: Delete Exit Status Artifacts
         if: always()
-        uses: geekyeggo/delete-artifact@v3
+        uses: geekyeggo/delete-artifact@v2
         with:
           name: exitstatus
           failOnError: false
diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
index ff676ce90..368f3bed9 100644
--- a/.github/workflows/templates/ci-tail.yml
+++ b/.github/workflows/templates/ci-tail.yml
@@ -18,7 +18,7 @@
 
       - name: Delete Exit Status Artifacts
         if: always()
-        uses: geekyeggo/delete-artifact@v3
+        uses: geekyeggo/delete-artifact@v2
         with:
           name: exitstatus
           failOnError: false

From 7c0c04dc4f4575807eea7aaff5ce58d517618af1 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 15 Jul 2024 14:16:13 -0600
Subject: [PATCH 12/14] Updated delete-artifact to v5, due to deprecated v4,
 for corresponding upload-artifact v4

---
 .github/workflows/ci.yml                | 2 +-
 .github/workflows/templates/ci-tail.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3a1569762..9c81057c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -532,7 +532,7 @@ jobs:
 
       - name: Delete Exit Status Artifacts
         if: always()
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: exitstatus
           failOnError: false
diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
index 368f3bed9..712f5169e 100644
--- a/.github/workflows/templates/ci-tail.yml
+++ b/.github/workflows/templates/ci-tail.yml
@@ -18,7 +18,7 @@
 
       - name: Delete Exit Status Artifacts
         if: always()
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: exitstatus
           failOnError: false

From c6344035d68de070a41de7b98c67a3bff663780e Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 15 Jul 2024 15:08:05 -0600
Subject: [PATCH 13/14] Updated to not sort list or dicts, as in closed PR
 https://github.com/saltstack/salt-bootstrap/pull/1969

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index ec07b9c80..51983a05b 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2369,7 +2369,7 @@ __overwriteconfig() {
     fi
 
     # Convert json string to a yaml string and write it to config file. Output is dumped into tempfile.
-    "$good_python" -c "import json; import yaml; jsn=json.loads('$json'); yml=yaml.safe_dump(jsn, line_break='\\n', default_flow_style=False); config_file=open('$target', 'w'); config_file.write(yml); config_file.close();" 2>"$tempfile"
+    "$good_python" -c "import json; import yaml; jsn=json.loads('$json'); yml=yaml.safe_dump(jsn, line_break='\\n', default_flow_style=False, sort_keys=False); config_file=open('$target', 'w'); config_file.write(yml); config_file.close();" 2>"$tempfile"
 
     # No python errors output to the tempfile
     if [ ! -s "$tempfile" ]; then

From a8703157e128f8bba3fcc93ed85adb6b9133eae0 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Tue, 16 Jul 2024 15:11:31 +0000
Subject: [PATCH 14/14] Update develop branch for the v2024.07.16 release

---
 CHANGELOG.md       | 14 ++++++++++++++
 bootstrap-salt.ps1 |  2 +-
 bootstrap-salt.sh  |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf127871b..413083af4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# v2024.07.16
+
+## What's Changed
+
+- Update bootstrap-salt.sh by @javatask in https://github.com/saltstack/salt-bootstrap/pull/2005
+- Updated GitHub actions to later v4 by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2004
+- Don't sort lists and dicts, as order of items matters  by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2006
+
+## New Contributors
+
+- @javatask made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/2005
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.07.12...v2024.07.16
+
 # v2024.07.12
 
 ## What's Changed
diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 726723cf3..a428ecfe4 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -110,7 +110,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2024.07.12"
+$__ScriptVersion = "2024.07.16"
 $ScriptName = $myInvocation.MyCommand.Name
 
 # We'll check for the Version next, because it also has no requirements
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 51983a05b..2a14290d3 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -26,7 +26,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2024.07.12"
+__ScriptVersion="2024.07.16"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"