Skip to content

Commit

Permalink
Merge pull request cri-o#7602 from saschagrunert/artifacts-gh-actions
Browse files Browse the repository at this point in the history
Bump actions/upload-artifact and actions/download-artifact actions
  • Loading branch information
openshift-merge-bot[bot] authored Dec 18, 2023
2 parents 435d2df + 366f924 commit b8777e7
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
key: go-test-binaries-${{ matrix.run.arch }}-${{ hashFiles('**/go.sum') }}-${{ hashFiles('test') }}
- run: scripts/github-actions-packages
- run: make all test-binaries
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: test-binaries-${{ matrix.run.arch }}
path: |
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
~/go/pkg/mod
key: go-critest-${{ matrix.run.arch }}-${{ hashFiles('**/go.sum') }}-${{ hashFiles('scripts/versions') }}
- uses: sigstore/cosign-installer@v3
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: test-binaries-${{ matrix.run.arch }}
- name: Fix artifact permissions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/osff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: SARIF file
path: results.sarif
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ jobs:
- run: bin/crio version
- run: make bin/crio.cross.linux.amd64
- run: bin/crio.cross.linux.amd64 version
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build
path: |
bin/crio
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: docs
path: |
docs/crio.8
docs/crio.conf.5
docs/crio.conf.d.5
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: config
path: crio.conf
Expand All @@ -56,7 +56,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build
path: bin
Expand All @@ -70,7 +70,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build
path: bin
Expand All @@ -84,7 +84,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build
path: bin
Expand All @@ -105,7 +105,7 @@ jobs:
pushFilter: cri-o
- run: nix-build nix
- run: result/bin/crio version
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-static-amd64
path: |
Expand All @@ -126,7 +126,7 @@ jobs:
pushFilter: cri-o
- run: nix-build nix/default-arm64.nix
- run: file result/bin/crio | grep aarch64
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-static-arm64
path: |
Expand All @@ -147,7 +147,7 @@ jobs:
pushFilter: cri-o
- run: nix-build nix/default-ppc64le.nix
- run: file result/bin/crio | grep PowerPC
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-static-ppc64le
path: |
Expand All @@ -162,15 +162,15 @@ jobs:
- build-static-arm64
- build-static-ppc64le
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-static-amd64
path: ${{ github.sha }}/amd64
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-static-arm64
path: ${{ github.sha }}/arm64
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-static-ppc64le
path: ${{ github.sha }}/ppc64le
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
- release-notes
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: release-notes
path: build/release-notes
Expand Down Expand Up @@ -249,9 +249,9 @@ jobs:
run: |
sudo PATH="$PATH" GOCACHE="$(go env GOCACHE)" GOMODCACHE="$(go env GOMODCACHE)" make testunit
sudo chown -R $(id -u):$(id -g) "$(go env GOCACHE)" "$(go env GOMODCACHE)"
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: unit
name: unit-${{ matrix.run.arch }}
path: build/coverage

coverage:
Expand All @@ -261,9 +261,9 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: unit
name: unit-amd64
path: build/coverage
- run: make codecov

Expand All @@ -288,7 +288,7 @@ jobs:
- run: make release-notes
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: release-notes
path: build/release-notes
Expand All @@ -311,7 +311,7 @@ jobs:
- run: make dependencies
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: dependencies
path: build/dependencies
Expand Down

0 comments on commit b8777e7

Please sign in to comment.