rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-04-24 17:12:16 +02:00
Code Issues Releases Activity

ci: install cross from crates.io

Browse Source 
A new release of cross has been put out, so we
no longer need to install it from git.

PR #1728
This commit is contained in:
Taiki Endo 2020-11-09 21:25:41 +09:00 committed by GitHub
parent 3ca324fda7
commit 59644d4592
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -107,9 +107,7 @@ jobs:
- name: Use Cross - name: Use Cross
if: matrix.target != '' if: matrix.target != ''
run: | run: |
# FIXME: to work around bugs in latest cross release, install master. cargo install cross
# See: https://github.com/rust-embedded/cross/issues/357
cargo install --git https://github.com/rust-embedded/cross
echo "::set-env name=CARGO::cross" echo "::set-env name=CARGO::cross"
echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}" echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}"
echo "::set-env name=TARGET_DIR::./target/${{ matrix.target }}" echo "::set-env name=TARGET_DIR::./target/${{ matrix.target }}"

4
.github/workflows/release.yml vendored
View File

@ -131,9 +131,7 @@ jobs:
- name: Use Cross - name: Use Cross
# if: matrix.os != 'windows-2019' # if: matrix.os != 'windows-2019'
run: | run: |
# FIXME: to work around bugs in latest cross release, install master. cargo install cross
# See: https://github.com/rust-embedded/cross/issues/357
cargo install --git https://github.com/rust-embedded/cross
echo "::set-env name=CARGO::cross" echo "::set-env name=CARGO::cross"
echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}" echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}"
echo "::set-env name=TARGET_DIR::./target/${{ matrix.target }}" echo "::set-env name=TARGET_DIR::./target/${{ matrix.target }}"

4
ci/utils.sh
View File

@ -99,9 +99,7 @@ is_osx() {
builder() { builder() {
if is_musl && is_x86_64; then if is_musl && is_x86_64; then
# cargo install cross cargo install cross
# To work around https://github.com/rust-embedded/cross/issues/357
cargo install --git https://github.com/rust-embedded/cross --force
echo "cross" echo "cross"
else else
echo "cargo" echo "cargo"