Fix some ci problems

FNNDSC · Nov 7, 2023 · 0ef7a1e · 0ef7a1e
1 parent 5a9c7d4
commit 0ef7a1e
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -46,15 +46,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - { os: ubuntu-latest  , target: armv7-unknown-linux-gnueabihf  , deb: false , use-cross: use-cross }
-        - { os: ubuntu-latest  , target: aarch64-unknown-linux-gnu      , deb: true  , use-cross: use-cross }
-        - { os: ubuntu-latest  , target: aarch64-unknown-linux-musl     , deb: false , use-cross: use-cross }
-        - { os: ubuntu-latest  , target: powerpc-unknown-linux-gnu      , deb: true  , use-cross: use-cross }
-        - { os: ubuntu-latest  , target: powerpc64-unknown-linux-gnu    , deb: true  , use-cross: use-cross }
-        - { os: ubuntu-latest  , target: powerpc64le-unknown-linux-gnu  , deb: true  , use-cross: use-cross }
-        - { os: ubuntu-latest  , target: riscv64gc-unknown-linux-gnu    , deb: false , use-cross: use-cross }
-        - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu       , deb: true  , use-cross: use-cross }
-        - { os: ubuntu-latest  , target: x86_64-unknown-linux-musl      , deb: false , use-cross: use-cross, convenient: true }
+        - { os: ubuntu-latest  , target: armv7-unknown-linux-gnueabihf  , use-cross: use-cross }
+        - { os: ubuntu-latest  , target: aarch64-unknown-linux-gnu      , use-cross: use-cross }
+        - { os: ubuntu-latest  , target: aarch64-unknown-linux-musl     , use-cross: use-cross }
+        - { os: ubuntu-latest  , target: powerpc-unknown-linux-gnu      , use-cross: use-cross }
+        - { os: ubuntu-latest  , target: powerpc64-unknown-linux-gnu    , use-cross: use-cross }
+        - { os: ubuntu-latest  , target: powerpc64le-unknown-linux-gnu  , use-cross: use-cross }
+        - { os: ubuntu-latest  , target: riscv64gc-unknown-linux-gnu    , use-cross: use-cross }
+        - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu       , use-cross: use-cross, deb: deb }
+        - { os: ubuntu-latest  , target: x86_64-unknown-linux-musl      , use-cross: use-cross, convenient: true }
 
         - { os: macos-latest   , target: x86_64-apple-darwin }
         - { os: macos-latest   , target: aarch64-apple-darwin }
@@ -82,12 +82,13 @@ jobs:
       with:
         key: ${{ matrix.target }}
     - name: Build
-      run: cargo build --release
-    
+      run: cargo build --release --target ${{ matrix.target }}
+
     # Bundle
     # ------------------------------------------------------------
     - name: Extract crate information
       id: crate-metadata
+      shell: bash
       run: |
         name="$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].name')"
         version="$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version')"
@@ -119,7 +120,7 @@ jobs:
     - name: Copy "convenience" binary to release directory
       if: matrix.convenient
       shell: bash
-      run: cp -v 'target/${{ matrix.triple.target }}/release/${{ steps.crate-metadata.outputs.name }}' release/
+      run: cp -v 'target/${{ matrix.target }}/release/${{ steps.crate-metadata.outputs.name }}' release/
 
     - name: Build Debian release
       id: deb