diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad8bc197..aa3ea63b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,18 +100,14 @@ 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 + - uses: taiki-e/setup-cross-toolchain-action@musl with: target: ${{ matrix.target }} - if: (matrix.os == '' || startsWith(matrix.os, 'ubuntu')) && !contains(matrix.target, '-musl') - - uses: taiki-e/install-action@cross - if: contains(matrix.target, '-musl') + if: matrix.os == '' || startsWith(matrix.os, 'ubuntu') - run: echo "RUSTFLAGS=${RUSTFLAGS} -C target-feature=+crt-static" >>"${GITHUB_ENV}" if: endsWith(matrix.target, 'windows-msvc') - - run: echo "cargo=cross" >>"${GITHUB_ENV}" - if: contains(matrix.target, '-musl') - - run: $cargo build --target ${{ matrix.target }} - - run: $cargo build --target ${{ matrix.target }} --release + - run: cargo build --target ${{ matrix.target }} + - run: cargo build --target ${{ matrix.target }} --release # For debugging - uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3801f3b6..071557a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,9 +82,7 @@ jobs: - 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: contains(matrix.target, '-musl') + if: matrix.os == '' || startsWith(matrix.os, 'ubuntu') - 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