Merge develop into stable for v2024.07.16 release

saltstack · Jul 16, 2024 · 08bd053 · 08bd053
2 parents 1f055fc + a870315
commit 08bd053
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 15 deletions.
diff --git 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,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@v5
         with:
           name: exitstatus
           failOnError: false

diff --git 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@v5
         with:
           name: exitstatus
           failOnError: false

diff --git 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
@@ -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
@@ -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-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

diff --git 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/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``

diff --git 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
@@ -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"
@@ -1388,6 +1388,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]"
             ;;
@@ -2367,7 +2368,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