Merge pull request #2021 from dmurphy18/fix_actions

Further action updates
saltstack · Sep 24, 2024 · 7e64ec0 · 7e64ec0
2 parents 8d0aca6 + 3d58d55
commit 7e64ec0
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,8 +49,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
 
   generate-actions-workflow:
     name: Generate The Actions Workflow
@@ -62,7 +62,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -86,8 +86,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
 
   lint:
     name: Lint
@@ -111,8 +111,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
 
 
 
@@ -512,14 +512,15 @@ jobs:
         if: always()
         uses: actions/download-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          path: exitstatus/
+          pattern: exitstatus-*
+          merge-multiple: true
 
       - name: Delete Exit Status Artifacts
         if: always()
         uses: geekyeggo/delete-artifact@v5
         with:
-          name: exitstatus
+          pattern: exitstatus-*
           failOnError: false
 
       - name: Set Pipeline Exit Status

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -145,6 +145,7 @@ jobs:
           path: |
             .cut_release_version
             .cut_release_changes
+          include-hidden-files: true
 
   merge-develop-into-stable:
     name: Merge develop into stable
@@ -259,6 +260,7 @@ jobs:
           ref: stable
           repository: ${{ github.repository }}
           ssh-key: ${{ secrets.SALT_BOOTSTRAP_RELEASE_KEY }}
+
       - name: Download Release Details
         uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
@@ -13,14 +13,15 @@
         if: always()
         uses: actions/download-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          path: exitstatus/
+          pattern: exitstatus-*
+          merge-multiple: true
 
       - name: Delete Exit Status Artifacts
         if: always()
         uses: geekyeggo/delete-artifact@v5
         with:
-          name: exitstatus
+          pattern: exitstatus-*
           failOnError: false
 
       - name: Set Pipeline Exit Status

diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
@@ -49,8 +49,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
 
   generate-actions-workflow:
     name: Generate The Actions Workflow
@@ -62,7 +62,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -86,8 +86,8 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
 
   lint:
     name: Lint
@@ -111,5 +111,5 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}
+          path: exitstatus/
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -45,7 +45,7 @@ jobs:
           bundler-cache: true
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -79,7 +79,7 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: exitstatus
-          path: exitstatus
+          name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
+          path: exitstatus/
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
@@ -52,7 +52,7 @@ jobs:
           bundler-cache: true
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -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
+          name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
+          path: exitstatus/
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@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -81,7 +81,7 @@ jobs:
           env
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -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
+          name: exitstatus-${{ github.job }}-${{ matrix.instance }}-${{ inputs.distro-slug }}
+          path: exitstatus/