From 8a2ca9e625da87bfb359f0a9a085be687dabe939 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 13:50:58 +0000
Subject: [PATCH 1/2] [gha] Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fcef3b0..ec6c62e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,7 +86,7 @@ jobs:
           targets: __NONE__  # Only run preflights
 
       - name: Retrieve results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ERC_Output
           path: generated
@@ -110,7 +110,7 @@ jobs:
           targets: __NONE__  # Only run preflights
 
       - name: Retrieve results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: DRC_Output
           path: generated
@@ -136,19 +136,19 @@ jobs:
           verbose: 0  # use 3 for debugging
 
       - name: Upload bill of materials files as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bom
           path: bom_files_compressed
 
       - name: Upload schematic files as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: schematics
           path: schematics
 
       - name: Upload schematic files as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: gerber_files
           path: gerber_files_compressed

From 58e93fe20fafbd668af0bb2ddd71277c72bde005 Mon Sep 17 00:00:00 2001
From: Patrick Baus <patrick.baus@physik.tu-darmstadt.de>
Date: Sun, 17 Dec 2023 11:38:49 +0100
Subject: [PATCH 2/2] Updated to actions/download-artifact@v4

---
 .github/workflows/ci.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec6c62e..ae784bc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -138,19 +138,19 @@ jobs:
       - name: Upload bill of materials files as artifact
         uses: actions/upload-artifact@v4
         with:
-          name: bom
+          name: bom-${{ matrix.variant }}
           path: bom_files_compressed
 
       - name: Upload schematic files as artifact
         uses: actions/upload-artifact@v4
         with:
-          name: schematics
+          name: schematics-${{ matrix.variant }}
           path: schematics
 
       - name: Upload schematic files as artifact
         uses: actions/upload-artifact@v4
         with:
-          name: gerber_files
+          name: gerber_files-${{ matrix.variant }}
           path: gerber_files_compressed
 
   release:
@@ -163,9 +163,15 @@ jobs:
         variant: [ 'default' ]
     steps:
       - name: Download manufacturing files artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          path: ./manufacturing_files
+          path: artifacts
+
+      - name: Merge artifacts
+        run: |
+          mkdir ./manufacturing_files
+          mv artifacts/*/* ./manufacturing_files
+        shell: bash
 
       - name: Display structure of downloaded files
         run: ls -R