CI: reorganize matrices

ahihi · Aug 2, 2024 · c3ac9fc · c3ac9fc
1 parent f670345
commit c3ac9fc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,13 +16,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target:
-          - x86_64-unknown-linux-gnu
-          - aarch64-unknown-linux-gnu
-          - x86_64-pc-windows-msvc
-          - i686-pc-windows-msvc
-          - x86_64-apple-darwin
-          - aarch64-apple-darwin
+        platform:
+          - target: x86_64-unknown-linux-gnu
+          - target: aarch64-unknown-linux-gnu
+          - target: x86_64-pc-windows-msvc
+          - target: i686-pc-windows-msvc
+          - target: x86_64-apple-darwin
+          - target: aarch64-apple-darwin
 
         include:
           - target: x86_64-unknown-linux-gnu
@@ -42,7 +42,7 @@ jobs:
 
     env:
       PROJECT_NAME: autocrap
-      CARGO_BUILD_TARGET: ${{ matrix.target }}
+      CARGO_BUILD_TARGET: ${{ matrix.platform.target }}
       CARGO_TERM_COLOR: always
       MACOSX_DEPLOYMENT_TARGET: 10.12
       RUSTFLAGS:
@@ -62,14 +62,14 @@ jobs:
         uses: houseabsolute/actions-rust-cross@v0
         with:
           command: build
-          target: ${{ matrix.target }}
+          target: ${{ matrix.platform.target }}
           args: "--verbose"
           strip: true
 
       - name: upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.PROJECT_NAME }}-${{ matrix.target }}
+          name: ${{ env.PROJECT_NAME }}-${{ matrix.platform.target }}
           path: |
-            target/${{ matrix.target }}/debug/${{ env.PROJECT_NAME }}
-            target/${{ matrix.target }}/debug/${{ env.PROJECT_NAME }}.exe
+            target/${{ matrix.platform.target }}/debug/${{ env.PROJECT_NAME }}
+            target/${{ matrix.platform.target }}/debug/${{ env.PROJECT_NAME }}.exe
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,13 +21,19 @@ jobs:
 
     strategy:
       matrix:
-        target:
-          - x86_64-unknown-linux-gnu
-          - aarch64-unknown-linux-gnu
-          - x86_64-pc-windows-msvc
-          - i686-pc-windows-msvc
-          - x86_64-apple-darwin
-          - aarch64-apple-darwin
+        platform:
+          - target: x86_64-unknown-linux-gnu
+            name: linux-x86_64
+          - target: aarch64-unknown-linux-gnu
+            name: linux-aarch64
+          - target: x86_64-pc-windows-msvc
+            name: windows-x86_64
+          - target: i686-pc-windows-msvc
+            name: windows-i686
+          - target: x86_64-apple-darwin
+            name: macos-x86_64
+          - target: aarch64-apple-darwin
+            name: macos-aarch64
 
     env:
       PROJECT_NAME: autocrap
@@ -42,23 +48,23 @@ jobs:
           version=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "'"$PROJECT_NAME"'").version')
           echo "version=$version" >> "$GITHUB_OUTPUT"
 
-      - name: retrieve ${{ matrix.target }} binary
+      - name: retrieve ${{ matrix.platform.target }} binary
         uses: dawidd6/action-download-artifact@v6
         with:
           workflow: build.yml
           commit: ${{ env.GITHUB_SHA }}
-          name: ${{ env.PROJECT_NAME }}-${{ matrix.target }}
+          name: ${{ env.PROJECT_NAME }}-${{ matrix.platform.target }}
           path: target
 
       - name: build archives
         working-directory: target
         run: |
-          ARCHIVE_NAME='${{ env.PROJECT_NAME }}-${{ steps.meta.outputs.version }}-${{ matrix.target }}'
+          ARCHIVE_NAME='${{ env.PROJECT_NAME }}-${{ steps.meta.outputs.version }}-${{ matrix.platform.name }}'
           echo "ARCHIVE_NAME=$ARCHIVE_NAME"
 
           mkdir "$ARCHIVE_NAME"
 
-          case '${{ matrix.target }}' in
+          case '${{ matrix.platform.target }}' in
             *-windows-*)
               cp -a "${PROJECT_NAME}.exe" "$ARCHIVE_NAME"
               zip "${ARCHIVE_NAME}.zip" "$ARCHIVE_NAME"/*