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 01/10] 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 9c4e9cf..2b4a2f7 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 d043786..bfdb47b 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 8a18b48..1c7ef66 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 e811d7f..da692ed 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 0f292d3..c733ffe 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 dca430a..9c54204 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 425b158..b61c05b 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 09eda40..1120fd8 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 02/10] 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 1c7ef66..3dea10e 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 9c54204..6616c7f 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 b61c05b..2590a73 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 1120fd8..0c64b2a 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 03/10] 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 3dea10e..2d92580 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 04/10] 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 2d92580..3dea10e 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 05/10] 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 3dea10e..36661ea 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 06/10] 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 bfdb47b..d043786 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 36661ea..8a18b48 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 6616c7f..6c74df8 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 0c64b2a..09eda40 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 07/10] 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 2b4a2f7..def94a3 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 da692ed..e811d7f 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 08/10] 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 def94a3..51160a9 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 e811d7f..ff676ce 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 09/10] 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 51160a9..3a15697 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 ff676ce..368f3be 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 10/10] 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 3a15697..9c81057 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 368f3be..712f516 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