Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert usage of arsing/cross to upstream cross 0.2 #6197

Merged
merged 4 commits into from
Mar 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
15 changes: 0 additions & 15 deletions builds/misc/templates/build-edgelet-linux.yaml

This file was deleted.

31 changes: 0 additions & 31 deletions builds/misc/templates/build-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -266,30 +266,6 @@ stages:
project: Microsoft.Azure.Devices.Edge.Azure.Monitor
buildx_flag: 'true'

################################################################################
# linux - Rust amd64
################################################################################
- template: image-linux-rust-jobs.yaml
parameters:
archName: amd64
targetArch: x86_64

################################################################################
# linux - Rust arm32
################################################################################
- template: image-linux-rust-jobs.yaml
parameters:
archName: arm32
targetArch: armv7l

################################################################################
# linux - Rust arm64
################################################################################
- template: image-linux-rust-jobs.yaml
parameters:
archName: arm64
targetArch: aarch64

################################################################################
- job: windows
################################################################################
Expand Down Expand Up @@ -500,9 +476,6 @@ stages:
- ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker
dependsOn:
- linux_dotnet_projects
- linux_rust_amd64
- linux_rust_arm32
- linux_rust_arm64
- windows
variables:
tags: "['latest']"
Expand All @@ -518,11 +491,7 @@ stages:
displayName: 'Publish Edge Hub Manifest'
- script: scripts/linux/buildManifest.sh -r $(registry.address) -v $(Build.BuildNumber) -t $(System.DefaultWorkingDirectory)/edge-modules/SimulatedTemperatureSensor/docker/manifest.yaml.template -n microsoft --tags "$(tags)"
displayName: 'Publish Temperature Sensor Manifest'
- script: scripts/linux/buildManifest.sh -r $(registry.address) -v $(Build.BuildNumber) -t $(System.DefaultWorkingDirectory)/edgelet/iotedged/docker/manifest.yaml.template -n microsoft --tags "$(tags)"
displayName: 'Publish azureiotedge-iotedged Manifest'
- script: scripts/linux/buildManifest.sh -r $(registry.address) -v $(Build.BuildNumber) -t $(System.DefaultWorkingDirectory)/edge-modules/iotedge-diagnostics-dotnet/docker/manifest.yaml.template -n microsoft --tags "$(tags)"
displayName: 'Publish azureiotedge-diagnostics Manifest'
- script: scripts/linux/buildManifest.sh -r $(registry.address) -v $(Build.BuildNumber) -t $(System.DefaultWorkingDirectory)/edgelet/iotedge-proxy/docker/manifest.yaml.template -n microsoft --tags "$(tags)"
displayName: 'Publish azureiotedge-proxy Manifest'
- script: scripts/linux/buildManifest.sh -r $(registry.address) -v $(Build.BuildNumber) -t $(System.DefaultWorkingDirectory)/edge-modules/metrics-collector/docker/manifest.yaml.template -n microsoft --tags "$(tags)"
displayName: 'Publish azureiotedge-metrics-collector Manifest'
64 changes: 0 additions & 64 deletions builds/misc/templates/image-linux-rust-jobs.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions builds/misc/templates/image-linux-rust.yaml

This file was deleted.

216 changes: 0 additions & 216 deletions scripts/linux/buildEdgelet.sh

This file was deleted.