Update artifact management following the update of actions

srozange · Dec 25, 2023 · e428518 · e428518
1 parent 53feaea
commit e428518
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
@@ -80,7 +80,7 @@ jobs:
       - name: 'Upload build artifact'
         uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-${{ runner.os }}
           path: |
             target/distributions/*.zip
             target/distributions/*.tar.gz
@@ -104,6 +104,9 @@ jobs:
 
       - name: 'Download all build artifacts'
         uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+          merge-multiple: true
 
       - name: 'Set up Java'
         uses: actions/setup-java@v4
@@ -127,6 +130,9 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
+      - name: 'Move Docker runner to target'
+        run: mkdir target && mv artifacts/*runner* target/
+
       - name: 'Build and push Docker image'
         uses: docker/build-push-action@v5
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -96,7 +96,7 @@ jobs:
       - name: 'Upload build artifact'
         uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-${{ runner.os }}
           path: |
             target/distributions/*.zip
             target/distributions/*.tar.gz
@@ -121,6 +121,9 @@ jobs:
 
       - name: 'Download all build artifacts'
         uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+          merge-multiple: true
 
       - name: 'Set up Java'
         uses: actions/setup-java@v4
@@ -135,6 +138,9 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-
 
+      - name: 'Move Docker runner to target'
+        run: mkdir target && mv artifacts/*runner* target/
+
       - name: 'Set up Docker Buildx'
         uses: docker/setup-buildx-action@v3