Switch to using baseline cross

Author: CraftSpider

dist/azure-build-and-test-cross.yml

@@ -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
@@ -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