From 5d0d9f4b76bad27f9b87c74eb902cf4d70a10d03 Mon Sep 17 00:00:00 2001
From: Andrzej Stencel <astencel@sumologic.com>
Date: Tue, 13 Feb 2024 21:37:28 +0100
Subject: [PATCH] more fixes to build-and-test workflow artifact names

---
 .github/workflows/build-and-test.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 4426a1f28283..767f0a487586 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -290,7 +290,7 @@ jobs:
       - 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() }}
@@ -315,7 +315,8 @@ jobs:
       - uses: actions/checkout@v4
       - 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:
@@ -504,7 +505,7 @@ jobs:
       - name: Upload Collector Binaries
         uses: actions/upload-artifact@v4
         with:
-          name: collector-binaries
+          name: collector-binaries-${{ matrix.os }}-${{ matrix.arch }}
           path: ./bin/*
 
   build-package:
@@ -527,8 +528,9 @@ jobs:
       - name: Download Collector Binaries
         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
@@ -564,8 +566,9 @@ jobs:
       - name: Download Binaries
         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
@@ -597,8 +600,9 @@ jobs:
       - name: Download Binaries
         uses: actions/download-artifact@v4
         with:
-          name: collector-binaries
+          merge-multiple: true
           path: ./bin/
+          pattern: collector-binaries-*
       - name: Download Packages
         uses: actions/download-artifact@v4
         with:
@@ -639,8 +643,9 @@ jobs:
       - name: Download Binaries
         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@v4