fix gh artifacts upload

elastic · Oct 15, 2024 · 89046cb · 89046cb
1 parent 4015c3d
commit 89046cb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/.github/actions/docker-images/action.yml b/.github/actions/docker-images/action.yml
@@ -26,7 +26,7 @@ inputs:
   docker-images-folder:
     description: 'Docker build cache folder'
     required: false
-    default: '/tmp/.docker-images'
+    default: .docker-images
 
   goos:
     description: 'GOOS environment variable'
@@ -118,16 +118,16 @@ runs:
       name: Rotate cache
       shell: bash
       run: |
-        ls -lahR /tmp/ || true
+        ls -lahR ${{ inputs.docker-images-folder }} || true
         [[ -d ${{ inputs.docker-build-cache-folder }}-new ]] && rm -rf ${{ inputs.docker-build-cache-folder }} && mv ${{ inputs.docker-build-cache-folder }}-new ${{ inputs.docker-build-cache-folder }}
 
     - if: ${{ inputs.build-docker-images == 'true' }}
       name: Upload docker images
-      # Pin action version to 4.3.4 See https://github.com/actions/upload-artifact/issues/589
-      uses: actions/upload-artifact@v4.3.4
+      uses: actions/upload-artifact@v4
       with:
         name: docker-images
-        path: ${{ inputs.docker-images-folder }}
+        path: |
+          ${{ inputs.docker-images-folder }}/*.tar
         if-no-files-found: error
         retention-days: 2
         overwrite: true

diff --git a/.github/actions/k8s-ci/action.yml b/.github/actions/k8s-ci/action.yml
@@ -19,7 +19,7 @@ inputs:
   docker-images-folder:
     description: 'Docker build cache folder'
     required: false
-    default: '/tmp/.docker-images'
+    default: .docker-images
 runs:
   using: composite
   steps:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,6 +7,11 @@ on:
   #     - main
   #     - "[0-9]+.[0-9]+"
   #   types: [opened, synchronize, reopened]
+  pull_request:
+    branches:
+      - main
+      - "[0-9]+.[0-9]+"
+    types: [opened, synchronize, reopened]
   push:
     branches:
       - main
@@ -230,6 +235,7 @@ jobs:
         uses: ./.github/actions/docker-images
         with:
           build-docker-images: 'true'
+          docker-images-folder: .docker-images
 
   ci-k8s:
     needs: [ init-hermit, docker-images ]
@@ -280,15 +286,15 @@ jobs:
         uses: ./.github/actions/docker-images
         with:
           build-docker-images: 'false'
-          docker-images-folder: '/tmp/.docker-images'
+          docker-images-folder: .docker-images
 
       - name: Run k8s integration tests
         uses: ./.github/actions/k8s-ci
         with:
           kind-config: ${{ matrix.kind-config }}
           test-target: ${{ matrix.test-target }}
           values-file: ${{ matrix.values-file }}
-          docker-images-folder: '/tmp/.docker-images'
+          docker-images-folder: .docker-images
 
   upload-allure-results:
     needs: