make artifact names unique

This prevents failures after updating the upload-artifact action to v4.
open-telemetry · Feb 13, 2024 · 3cfc3f3 · 3cfc3f3
1 parent b744ceb
commit 3cfc3f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -551,7 +551,7 @@ jobs:
       - name: Upload Packages
         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
@@ -586,7 +586,7 @@ jobs:
       - name: Upload MSI
         uses: actions/upload-artifact@v4
         with:
-          name: collector-packages
+          name: collector-packages-msi
           path: ./dist/*.msi
 
   publish-check:
@@ -602,8 +602,9 @@ jobs:
       - name: Download Packages
         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
@@ -644,8 +645,9 @@ jobs:
       - name: Download Packages
         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

diff --git a/.github/workflows/load-tests.yml b/.github/workflows/load-tests.yml
@@ -45,10 +45,10 @@ jobs:
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make install-tools
       - run: make oteltestbedcol
-      - name: Upload Collector Binaries
+      - name: Upload Testbed Binaries
         uses: actions/upload-artifact@v4
         with:
-          name: collector-binaries
+          name: testbed-binaries
           path: ./bin/*
       - name: Split Loadtest Jobs
         id: splitloadtest
@@ -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
+      - name: Download Testbed Binaries
         uses: actions/download-artifact@v4
         with:
-          name: collector-binaries
+          name: testbed-binaries
           path: bin/
       - run: chmod +x bin/*
       - name: Loadtest