Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] upgrade actions/upload-artifact and actions/download-artifact to v4 #31236

Merged
merged 3 commits into from
Feb 13, 2024
Merged

[chore] upgrade actions/upload-artifact and actions/download-artifact to v4 #31236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b744ceb
update actions to v4
andrzej-stencel Feb 13, 2024
3cfc3f3
make artifact names unique
andrzej-stencel Feb 13, 2024
5d0d9f4
more fixes to build-and-test workflow artifact names
andrzej-stencel Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 29 additions & 22 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,10 @@ jobs:
- name: Run Unit Tests With Coverage
if: startsWith( matrix.go-version, '1.21' ) # only run coverage on one version
run: make gotest-with-cover GROUP=${{ matrix.group }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: startsWith( matrix.go-version, '1.21' ) # only upload artifact for one version
with:
name: coverage-artifacts
name: coverage-artifacts-${{ matrix.go-version }}-${{ matrix.group }}
path: ${{ matrix.group }}-coverage.txt
unittest:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
Expand All @@ -313,9 +313,10 @@ jobs:
needs: [unittest]
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: coverage-artifacts
merge-multiple: true
pattern: coverage-artifacts-*
- name: Upload coverage report
uses: Wandalen/wretry.action@v1.3.0
with:
Expand Down Expand Up @@ -502,9 +503,9 @@ jobs:
- name: Build Collector ${{ matrix.binary }}
run: make GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM=${{ matrix.arm }} otelcontribcol
- name: Upload Collector Binaries
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: collector-binaries
name: collector-binaries-${{ matrix.os }}-${{ matrix.arch }}
path: ./bin/*

build-package:
Expand All @@ -525,10 +526,11 @@ jobs:
- name: Install fpm
run: gem install --no-document fpm -v 1.15.1
- name: Download Collector Binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: collector-binaries
merge-multiple: true
path: bin/
pattern: collector-binaries-*
- run: chmod +x bin/*
- name: Set Release Tag
id: github_tag
Expand All @@ -549,9 +551,9 @@ jobs:
./internal/buildscripts/packaging/fpm/test.sh dist/otel-contrib-collector*x86_64.rpm examples/demo/otel-collector-config.yaml
fi
- name: Upload Packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: collector-packages
name: collector-packages-${{ matrix.package_type }}
path: ./dist/*
windows-msi:
if: false # skip. See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/10113
Expand All @@ -562,10 +564,11 @@ jobs:
with:
fetch-depth: 0
- name: Download Binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: collector-binaries
merge-multiple: true
path: ./bin/
pattern: collector-binaries-*
- name: Cache Wix
id: wix-cache
uses: actions/cache@v3
Expand All @@ -584,9 +587,9 @@ jobs:
- name: Validate MSI
run: .\internal\buildscripts\packaging\msi\make.ps1 Confirm-MSI
- name: Upload MSI
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: collector-packages
name: collector-packages-msi
path: ./dist/*.msi

publish-check:
Expand All @@ -595,15 +598,17 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Download Binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: collector-binaries
merge-multiple: true
path: ./bin/
pattern: collector-binaries-*
- name: Download Packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: collector-packages
merge-multiple: true
path: ./dist/
pattern: collector-packages-*
- name: Verify Distribution Files Exist
id: check
run: ./.github/workflows/scripts/verify-dist-files-exist.sh
Expand Down Expand Up @@ -636,16 +641,18 @@ jobs:
if: steps.go-cache.outputs.cache-hit != 'true'
run: make install-tools
- name: Download Binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: collector-binaries
merge-multiple: true
path: ./bin/
pattern: collector-binaries-*
- run: chmod +x bin/*
- name: Download Packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: collector-packages
merge-multiple: true
path: ./dist/
pattern: collector-packages-*
- name: Add Permissions to Tool Binaries
run: chmod -R +x ./dist
- name: Verify Distribution Files Exist
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Build Collector
run: make otelcontribcol
- name: Upload Collector Binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: collector-binary
path: ./bin/*
Expand All @@ -66,7 +66,7 @@ jobs:
if: steps.go-cache.outputs.cache-hit != 'true'
run: make -j2 gomoddownload
- name: Download Collector Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: collector-binary
path: bin/
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
run: |
docker save otelcontribcol:latest > /tmp/otelcontribcol.tar
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: otelcontribcol
path: /tmp/otelcontribcol.tar
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
run: |
kubectl get csr -o=jsonpath='{range.items[?(@.spec.signerName=="kubernetes.io/kubelet-serving")]}{.metadata.name}{" "}{end}' | xargs kubectl certificate approve
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: otelcontribcol
path: /tmp
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/load-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ jobs:
if: steps.go-cache.outputs.cache-hit != 'true'
run: make install-tools
- run: make oteltestbedcol
- name: Upload Collector Binaries
uses: actions/upload-artifact@v3
- name: Upload Testbed Binaries
uses: actions/upload-artifact@v4
with:
name: collector-binaries
name: testbed-binaries
path: ./bin/*
- name: Split Loadtest Jobs
id: splitloadtest
Expand Down Expand Up @@ -83,10 +83,10 @@ jobs:
if: steps.go-cache.outputs.cache-hit != 'true'
run: make install-tools
- run: mkdir -p results && touch results/TESTRESULTS.md
- name: Download Collector Binaries
uses: actions/download-artifact@v3
- name: Download Testbed Binaries
uses: actions/download-artifact@v4
with:
name: collector-binaries
name: testbed-binaries
path: bin/
- run: chmod +x bin/*
- name: Loadtest
Expand All @@ -103,12 +103,12 @@ jobs:
- name: Upload Test Results
if: ${{ failure() || success() }}
continue-on-error: true
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: ./*.tar
- run: cp testbed/tests/results/benchmarks.json testbed/tests/results/${{steps.filename.outputs.name}}.json
- name: Upload benchmarks.json
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: benchmark-results
path: testbed/tests/results/${{steps.filename.outputs.name}}.json
Expand All @@ -123,7 +123,7 @@ jobs:
if: github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: benchmark-results
path: results
Expand Down
Loading