Readjust some action values

saltstack · Jul 15, 2024 · b36f307 · b36f307
1 parent 0daa3c4
commit b36f307
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@