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] 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