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
BurntSushi · Nov 9, 2020 · 59644d4 · 59644d4
1 parent 3ca324f
commit 59644d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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"