Merge #176

176: Use setup-cross-toolchain-action for linux-gnu and freebsd r=taiki-e a=taiki-e

Fixes #174 

Co-authored-by: Taiki Endo <te316e89@gmail.com>

.github/workflows/ci.yml

@@ -93,25 +93,23 @@ jobs:
       - name: Install Rust
         run: rustup update stable --no-self-update
       - run: rustup target add ${{ matrix.target }}
+      - uses: taiki-e/setup-cross-toolchain-action@v1
+        with:
+          target: ${{ matrix.target }}
+        if: (matrix.os == '' || startsWith(matrix.os, 'ubuntu')) && !contains(matrix.target, '-musl')
       - uses: taiki-e/install-action@cross
-        if: matrix.os == '' || startsWith(matrix.os, 'ubuntu')
+        if: contains(matrix.target, '-musl')
       - run: echo "RUSTFLAGS=${RUSTFLAGS} -C target-feature=+crt-static" >> "${GITHUB_ENV}"
         if: endsWith(matrix.target, 'windows-msvc')
       - run: echo "cargo=cross" >>"${GITHUB_ENV}"
-        if: matrix.target != 'x86_64-unknown-linux-gnu' && (matrix.os == '' || startsWith(matrix.os, 'ubuntu'))
+        if: contains(matrix.target, '-musl')
       - run: $cargo build --target ${{ matrix.target }}
       - run: $cargo build --target ${{ matrix.target }} --release
       # For debugging
-      # - uses: actions/upload-artifact@v3
-      #   with:
-      #     name: ${{ matrix.target }}
-      #     path: target/${{ matrix.target }}/release/cargo-hack.exe
-      #   if: startsWith(matrix.os, 'windows')
-      # - uses: actions/upload-artifact@v3
-      #   with:
-      #     name: ${{ matrix.target }}
-      #     path: target/${{ matrix.target }}/release/cargo-hack
-      #   if: "!startsWith(matrix.os, 'windows')"
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.target }}
+          path: target/${{ matrix.target }}/release/cargo-hack*
 
   test-compat:
     name: test (1.${{ matrix.rust }})

.github/workflows/release.yml

@@ -71,8 +71,12 @@ jobs:
           persist-credentials: false
       - name: Install Rust
         run: rustup update stable --no-self-update
+      - uses: taiki-e/setup-cross-toolchain-action@v1
+        with:
+          target: ${{ matrix.target }}
+        if: (matrix.os == '' || startsWith(matrix.os, 'ubuntu')) && !contains(matrix.target, '-musl')
       - uses: taiki-e/install-action@cross
-        if: matrix.os == '' || startsWith(matrix.os, 'ubuntu')
+        if: contains(matrix.target, '-musl')
       - run: echo "RUSTFLAGS=${RUSTFLAGS} -C target-feature=+crt-static" >> "${GITHUB_ENV}"
         if: endsWith(matrix.target, 'windows-msvc')
       - uses: taiki-e/upload-rust-binary-action@v1

Cargo.toml

@@ -36,8 +36,6 @@ slab = "0.4.4"
 termcolor = "1.1"
 toml_edit = "0.15"
 
-libc = "=0.2.137" # https://github.com/taiki-e/cargo-hack/issues/174
-
 [dev-dependencies]
 build-info = { path = "tests/auxiliary/build-info" }
 easy-ext = "1"