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

Use baseline cross instead of old, custom variant #1234

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
14 changes: 9 additions & 5 deletions dist/azure-build-and-test-cross.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,23 @@ steps:
- bash: docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
displayName: Set up QEMU

- bash: docker run --rm -v $(pwd):/work:rw,Z tectonictypesetting/ttcross:latest
displayName: Install custom-built cross tool
- bash: cargo install cross
displayName: Install cross

- bash: |
HOST_UID=$(id -u)
HOST_GID=$(id -g)
echo "##vso[task.setvariable variable=CROSS_ARGS;]--target=$TARGET --release"
echo "##vso[task.setvariable variable=CROSS_ROOTLESS_CONTAINER_ENGINE;]1"
echo "##vso[task.setvariable variable=DOCKER_OPTS;]--privileged -e HOST_UID=${HOST_UID} -e HOST_GID=${HOST_GID}"
displayName: Set build variables

# Main build/test

- bash: ./cross build $CROSS_ARGS --all
- bash: cross build $CROSS_ARGS --all
displayName: "cross build"

- bash: ./cross test $CROSS_ARGS --all
- bash: cross test $CROSS_ARGS --all
displayName: "cross test"

# Publish binaries
Expand All @@ -28,7 +32,7 @@ steps:
set -ex
artifact_dir="$(Build.ArtifactStagingDirectory)/binary-$TARGET"
mkdir -p "$artifact_dir"
cranko cargo package-released-binaries --command-name=./cross --reroot=. \
cranko cargo package-released-binaries --command-name=cross --reroot=. \
-t $TARGET \
$artifact_dir \
-- build $CROSS_ARGS
Expand Down