Skip to content

Commit

Permalink
fix gh artifacts upload
Browse files Browse the repository at this point in the history
  • Loading branch information
moukoublen committed Oct 30, 2024
1 parent 29e90ed commit 367b406
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/actions/docker-images/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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/[email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/k8s-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ]
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 367b406

Please sign in to comment.