diff options
| author | Taiki Endo <te316e89@gmail.com> | 2020-11-09 21:25:41 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 07:25:41 -0500 |
| commit | 59644d45928fff5ae2ef509a2ed6a5b63a7baf8c (patch) | |
| tree | 76f49daa22dda2f611716b3729b854cafc05aadb | |
| parent | 3ca324fda75885bf3523762ed57811d80abb3b00 (diff) | |
ci: install cross from crates.io
A new release of cross has been put out, so we
no longer need to install it from git.
PR #1728
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 4 | ||||
| -rw-r--r-- | ci/utils.sh | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eee64bd7..e0f164a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,9 +107,7 @@ jobs: - name: Use Cross if: matrix.target != '' run: | - # FIXME: to work around bugs in latest cross release, install master. - # See: https://github.com/rust-embedded/cross/issues/357 - cargo install --git https://github.com/rust-embedded/cross + cargo install cross echo "::set-env name=CARGO::cross" echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}" echo "::set-env name=TARGET_DIR::./target/${{ matrix.target }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d687d824..1afec176 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -131,9 +131,7 @@ jobs: - name: Use Cross # if: matrix.os != 'windows-2019' run: | - # FIXME: to work around bugs in latest cross release, install master. - # See: https://github.com/rust-embedded/cross/issues/357 - cargo install --git https://github.com/rust-embedded/cross + cargo install cross echo "::set-env name=CARGO::cross" echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}" echo "::set-env name=TARGET_DIR::./target/${{ matrix.target }}" diff --git a/ci/utils.sh b/ci/utils.sh index f9c59339..f3dc96d2 100644 --- a/ci/utils.sh +++ b/ci/utils.sh @@ -99,9 +99,7 @@ is_osx() { builder() { if is_musl && is_x86_64; then - # cargo install cross - # To work around https://github.com/rust-embedded/cross/issues/357 - cargo install --git https://github.com/rust-embedded/cross --force + cargo install cross echo "cross" else echo "cargo" |