Skip to content

Commit

Permalink
Revert usage of arsing/cross to upstream cross 0.2 (#6196)
Browse files Browse the repository at this point in the history
The fix we needed was merged into upstream a long time ago.

Ref: cross-rs/cross#52
Ref: cross-rs/cross@249500e
  • Loading branch information
arsing authored Mar 11, 2022
1 parent 60f8601 commit a0f148e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions builds/checkin/edgelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ jobs:
displayName: Set Version
- bash: scripts/linux/generic-rust/install.sh --project-root "edgelet"
displayName: Install Rust
- script: "cargo install --git https://github.com/arsing/cross.git --branch set-path"
displayName: "Install cross (fork with docker fix)"
- script: "cargo install cross --version ^0.2"
displayName: "Install cross"
- script: "cross build --target armv7-unknown-linux-gnueabihf"
displayName: armv7-unknown-linux-gnueabihf build
workingDirectory: $(Build.SourcesDirectory)/edgelet
Expand Down Expand Up @@ -92,8 +92,8 @@ jobs:
displayName: Set Version
- bash: scripts/linux/generic-rust/install.sh --project-root "edgelet"
displayName: Install Rust
- script: "cargo install --git https://github.com/arsing/cross.git --branch set-path"
displayName: "Install cross (fork with docker fix)"
- script: "cargo install cross --version ^0.2"
displayName: "Install cross"
- script: "cross build --target aarch64-unknown-linux-gnu"
displayName: aarch64-unknown-linux-gnu build
workingDirectory: $(Build.SourcesDirectory)/edgelet
Expand Down
4 changes: 2 additions & 2 deletions builds/ci/edgelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ jobs:
inputs:
filePath: scripts/linux/generic-rust/install.sh
arguments: --project-root "edgelet"
- script: cargo install --git https://github.com/arsing/cross.git --branch set-path
displayName: Install cross (fork with docker fix)
- script: cargo install cross --version ^0.2
displayName: Install cross
- task: Bash@3
displayName: armv7-unknown-linux-gnueabihf build
inputs:
Expand Down

0 comments on commit a0f148e

Please sign in to comment.