Fix artifact names

WAGO · Sep 25, 2021 · d358104 · d358104
1 parent 2120f3e
commit d358104
Showing 1 changed file with 26 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
         rm -rf "${BUILDX_CACHE}"
         mv /tmp/.buildx-cache-new "${BUILDX_CACHE}"
     
-  build-cross:
+  build-cross-binary:
 
     strategy:
       fail-fast: false
@@ -122,7 +122,7 @@ jobs:
       env:
         BUNDLE_PLATFORM: ${{ steps.docker-make.outputs.target-platform-id }}
       run: |
-        bundle_archive_name="dockerd-cross_${BUNDLE_PLATFORM}.tar"
+        bundle_archive_name="dockerd-cross-${BUNDLE_PLATFORM}.tar"
         bundle_archive="${BUILD_OUTPUT}/${bundle_archive_name}"
         tar -C "${BUILD_OUTPUT}/cross/${{ matrix.platform }}" -cvf "${bundle_archive}" .
         echo "::set-output name=archive::${bundle_archive}"
@@ -135,7 +135,7 @@ jobs:
         path: ${{ steps.create-bundle.outputs.archive }}
         retention-days: 7
 
-  build-binary:
+  build-static-binary:
 
     strategy:
       fail-fast: false
@@ -149,6 +149,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build-cache
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -170,9 +171,9 @@ jobs:
     - name: Create bundle
       id: create-bundle
       env:
-        BUNDLE_PLATFORM: ${{ matrix.arch }}
+        BUNDLE_PLATFORM: ${{ steps.docker-make.outputs.target-platform-id }}
       run: |
-        bundle_archive_name="dockerd-static_${BUNDLE_PLATFORM}.tar"
+        bundle_archive_name="dockerd-static-${BUNDLE_PLATFORM}.tar"
         bundle_archive="${BUILD_OUTPUT}/${bundle_archive_name}"
         tar -C "${BUILD_OUTPUT}/binary-daemon" -cvf "${bundle_archive}" .
         echo "::set-output name=archive::${bundle_archive}"
@@ -185,7 +186,7 @@ jobs:
         path: ${{ steps.create-bundle.outputs.archive }}
         retention-days: 7
 
-  build-dynbinary:
+  build-dynamic-binary:
 
     strategy:
       fail-fast: false
@@ -199,6 +200,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build-cache
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -220,9 +222,9 @@ jobs:
     - name: Create bundle
       id: create-bundle
       env:
-        BUNDLE_PLATFORM: ${{ matrix.arch }}
+        BUNDLE_PLATFORM: ${{ steps.docker-make.outputs.target-platform-id }}
       run: |
-        bundle_archive_name="dockerd-dynamic_${BUNDLE_PLATFORM}.tar"
+        bundle_archive_name="dockerd-dynamic-${BUNDLE_PLATFORM}.tar"
         bundle_archive="${BUILD_OUTPUT}/${bundle_archive_name}"
         tar -C "${BUILD_OUTPUT}/dynbinary-daemon" -cvf "${bundle_archive}" .
         echo "::set-output name=archive::${bundle_archive}"
@@ -249,21 +251,33 @@ jobs:
 
     runs-on: ubuntu-latest
     needs:
-      - build-binary
+      - build-static-binary
 
     env:
-      BUNDLE_PLATFORM: ${{ matrix.arch }}
-      BUNDLE_ARCHIVE_NAME: dockerd-static_${{ matrix.arch }}.tar
       TEST_SKIP_INTEGRATION_CLI: 1
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
 
+    - name: Set artifact information
+      id: set-artifact-info
+      uses: WAGO/docker-actions/artifact-info@release/v1.0
+      with:
+        version: ${{ env.VERSION }}
+        platform: ${{ matrix.platform }}
+
+    - name: Set bundle meta information
+      env:
+        BUNDLE_PLATFORM: ${{ steps.set-artifact-info.outputs.platform-id }}
+      run: |
+        echo "BUNDLE_PLATFORM=${BUNDLE_PLATFORM}" >> "${GITHUB_ENV}"
+        echo "BUNDLE_ARCHIVE_NAME=dockerd-static-${BUNDLE_PLATFORM}.tar" >> "${GITHUB_ENV}"
+
     - name: Download bundle
       uses: actions/download-artifact@v2
       with:
-        name: ${{ env.BUNDLE_ARCHIVE_NAME }}
+        name: ${{ ev.BUNDLE_ARCHIVE_NAME }}
         path: ${{ env.BUILD_OUTPUT }}
 
     - name: Extract bundle