Use baseline cross instead of old, custom variant

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

@@ -7,19 +7,26 @@ 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;]--cap-add SYS_ADMIN -e HOST_UID=${HOST_UID} -e HOST_GID=${HOST_GID}"
   displayName: Set build variables
 
 # Main build/test
 
-- bash: ./cross build $CROSS_ARGS --all
+- bash: |
+    echo "CROSS_ROOTLESS_CONTAINER_ENGINE: $CROSS_ROOTLESS_CONTAINER_ENGINE"
+    echo "DOCKER_OPTS: $DOCKER_OPTS"
+    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

dist/azure-build-and-test.yml

@@ -224,28 +224,28 @@ jobs:
       TOOLCHAIN: stable
 
   # pkg-config builds
-  - ${{ each build in parameters.pkgconfigBuilds }}:
-      - job: ${{ format('build_{0}_pkgconfig', build.name) }}
-        pool:
-          vmImage: ${{ build.vmImage }}
-        steps:
-          - template: azure-build-and-test-pkgconfig.yml
-            parameters:
-              ${{ insert }}: ${{ build.params }}
-        variables:
-          ${{ insert }}: ${{ build.vars }}
+#  - ${{ each build in parameters.pkgconfigBuilds }}:
+#      - job: ${{ format('build_{0}_pkgconfig', build.name) }}
+#        pool:
+#          vmImage: ${{ build.vmImage }}
+#        steps:
+#          - template: azure-build-and-test-pkgconfig.yml
+#            parameters:
+#              ${{ insert }}: ${{ build.params }}
+#        variables:
+#          ${{ insert }}: ${{ build.vars }}
 
   # vcpkg builds
-  - ${{ each build in parameters.vcpkgBuilds }}:
-      - job: ${{ format('build_{0}_vcpkg', build.name) }}
-        pool:
-          vmImage: ${{ build.vmImage }}
-        steps:
-          - template: azure-build-and-test-vcpkg.yml
-            parameters:
-              ${{ insert }}: ${{ build.params }}
-        variables:
-          ${{ insert }}: ${{ build.vars }}
+#  - ${{ each build in parameters.vcpkgBuilds }}:
+#      - job: ${{ format('build_{0}_vcpkg', build.name) }}
+#        pool:
+#          vmImage: ${{ build.vmImage }}
+#        steps:
+#          - template: azure-build-and-test-vcpkg.yml
+#            parameters:
+#              ${{ insert }}: ${{ build.params }}
+#        variables:
+#          ${{ insert }}: ${{ build.vars }}
 
   # cross builds
   - ${{ each build in parameters.crossBuilds }}: