Skip to content

Commit

Permalink
Revert usage of arsing/cross to upstream cross 0.1
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

The image-linux-rust job uses cross 0.1 and not 0.2. This is because
this job builds iotedge-proxy for x86_64-unknown-linux-musl, to make
an iotedge-proxy Docker image for Kubernetes. We do not have
a custom builder image for this target, so cross 0.2 would use upstream's image,
which does not have openssl. We *could* use cross 0.2 with a custom image,
like we do for the ARM targets (see Cross.toml), but for now this change just
sticks with cross 0.1. The openssl in 0.1's image is still ancient
(the image hasn't been updated in 4 years), but Dave said that can be tackled
later, as part of updating openssl across this branch in general.
  • Loading branch information
arsing committed Mar 11, 2022
1 parent c55a5db commit b94c551
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
8 changes: 4 additions & 4 deletions builds/checkin/edgelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ jobs:
displayName: Set Version
- script: edgelet/build/linux/install.sh
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 @@ -94,8 +94,8 @@ jobs:
displayName: Set Version
- script: edgelet/build/linux/install.sh
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 @@ -51,8 +51,8 @@ jobs:
displayName: Install Rust
inputs:
filePath: edgelet/build/linux/install.sh
- 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
6 changes: 4 additions & 2 deletions builds/misc/templates/image-linux-rust-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ jobs:
- bash: 'echo "##vso[task.setvariable variable=PATH;]${CARGO_HOME:-"$HOME/.cargo"}/bin:$PATH"'
displayName: Modify path

- bash: 'cargo install --git https://github.com/arsing/cross.git --branch set-path'
displayName: 'Install cross (fork with docker fix)'
# TODO: Update this to cross 0.2 when a solution for using openssl
# in cross 0.2's builder image is found.
- bash: 'cargo install cross --version ^0.1'
displayName: 'Install cross'

- template: build-edgelet-linux.yaml
parameters:
Expand Down

0 comments on commit b94c551

Please sign in to comment.