Move to upload-artifact and cache v4

qbarrand · Feb 27, 2024 · 2d4c17f · 2d4c17f
1 parent 0558d89
commit 2d4c17f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/.github/actions/collect-troubleshooting/action.yml b/.github/actions/collect-troubleshooting/action.yml
@@ -1,12 +1,11 @@
 name: Collect troubleshooting data
 
-description: This action fetches some troubleshooting data for KMM
-
 inputs:
-  output-file:
-    description: Name of the archive file
+  artifact-name:
+    description: The name of the artifact for the support bundle
     required: true
 
+description: This action fetches some troubleshooting data for KMM
 runs:
   using: composite
 
@@ -18,10 +17,10 @@ runs:
       shell: bash
 
     - name: Collect a support bundle
-      run: kubectl support-bundle -o ${{ inputs.output-file }} ./support/kmm.spec.yaml
+      run: kubectl support-bundle -o support-bundle.tar.gz ./support/kmm.spec.yaml
       shell: bash
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
-        name: support-bundle
-        path: ${{ inputs.output-file }}
+        name: ${{ inputs.artifact-name }}
+        path: support-bundle.tar.gz
diff --git a/.github/actions/create-minikube-cluster/action.yml b/.github/actions/create-minikube-cluster/action.yml
@@ -20,7 +20,7 @@ runs:
       shell: bash
 
     - name: Cache Minikube artifacts
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.minikube/cache
         key: ${{ runner.os }}-minikube-${{ steps.install-minikube.outputs.version }}

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -99,7 +99,7 @@ jobs:
           path: kmm-worker_local.tar
           retention-days: 1
 
-  e2e:
+    e2e:
     strategy:
       matrix:
         include:
@@ -180,10 +180,9 @@ jobs:
 
       - name: Collect troubleshooting data
         uses: ./.github/actions/collect-troubleshooting
-        if: ${{ always() }}
         with:
-          output-file: ${{ matrix.name }}-support-bundle.tar.gz
-
+          artifact-name: ${{ matrix.name }}
+        if: ${{ always() }}
 
   operator-upgrade:
 
@@ -248,6 +247,6 @@ jobs:
 
       - name: Collect troubleshooting data
         uses: ./.github/actions/collect-troubleshooting
-        if: ${{ always() }}
         with:
-          output-file: operator-upgrade-support-bundle.tar.gz
+          artifact-name: ${{ github.job }}
+        if: ${{ always() }}