Merge pull request #959 from pkgw/darwin-aarch64

dist: first attempt at darwin-aarch64 build support

Author: pkgw

Cargo.toml

@@ -120,7 +120,7 @@ tokio = "0.1.22"
 
 [package.metadata.vcpkg]
 git = "https://github.com/microsoft/vcpkg"
-rev = "01b29f6d8212bc845da64773b18665d682f5ab66"
+rev = "1be5a98d090b1d2beeb63a48ba800fbf006e8aca"
 
 [package.metadata.vcpkg.target]
 x86_64-apple-darwin = { install = ["freetype","harfbuzz[icu,graphite2]"] }

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

@@ -16,16 +16,30 @@ parameters:
 - name: windowsVcpkgWorkaround
   type: boolean
   default: false
+- name: testIt
+  type: boolean
+  default: true
 
 steps:
 - template: azure-generic-build-setup.yml
 
+- bash: rustup target add $TARGET
+  displayName: Add target $(TARGET)
+
 - bash: |
     set -xeuo pipefail
     brew install autoconf-archive automake libtool pkg-config
   displayName: "Install vcpkg dependencies (macOS)"
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
 
+- bash: |
+    set -xeuo pipefail
+    sudo apt-get update
+    sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y \
+      autoconf-archive
+  displayName: "Install vcpkg dependencies (Ubuntu)"
+  condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+
 # Note: setvariable + `set -x` adds spurious single quotes at ends of variable values
 - bash: |
     echo "##vso[task.setvariable variable=VCPKG_ROOT;]$(pwd)/target/vcpkg"
@@ -57,7 +71,7 @@ steps:
 
   - bash: |
       set -xeuo pipefail
-      cargo vcpkg -v build
+      cargo vcpkg -v build --target $TARGET
       ls target/vcpkg
       echo target/vcpkg/installed/*
       ls target/vcpkg/installed/*/lib
@@ -76,3 +90,4 @@ steps:
   parameters:
     canaryBuild: ${{ parameters.canaryBuild }}
     explicitFeatures: "external-harfbuzz"
+    testIt: ${{ parameters.testIt }}

dist/azure-build-and-test.yml

@@ -132,14 +132,30 @@ parameters:
 - name: vcpkgBuilds
   type: object
   default:
-  - name: macos
+  - name: x86_64_unknown_linux_gnu
+    vmImage: ubuntu-20.04
+    params:
+      canaryBuild: true
+    vars:
+      TARGET: x86_64-unknown-linux-gnu
+      TOOLCHAIN: stable
+
+  - name: x86_64_apple_darwin
     vmImage: macos-11
     params: {}
     vars:
       TARGET: x86_64-apple-darwin
       TOOLCHAIN: stable
 
-  - name: windows
+  - name: aarch64_apple_darwin
+    vmImage: macos-11
+    params:
+      testIt: false
+    vars:
+      TARGET: aarch64-apple-darwin
+      TOOLCHAIN: stable
+
+  - name: x86_64_pc_windows_msvc
     vmImage: windows-2019
     params:
       windowsVcpkgWorkaround: true
@@ -181,10 +197,9 @@ jobs:
       ${{ insert }}: ${{ build.vars }}
 
 # vcpkg builds
-# TODO: I think Linux/vcpkg is broken: https://github.com/mcgoo/vcpkg-rs/issues/21
 - ${{ each build in parameters.vcpkgBuilds }}:
   - job: ${{ format('build_{0}_vcpkg', build.name) }}
-    ${{ if eq(build.name, 'windows') }}:  # work around timeouts with slow builds
+    ${{ if eq(build.name, 'x86_64_pc_windows_msvc') }}:  # work around timeouts with slow builds
       dependsOn: windows_vcpkg_prebuild
     pool:
       vmImage: ${{ build.vmImage }}

dist/azure-generic-build.yml

@@ -22,6 +22,9 @@ parameters:
 - name: explicitFeatures
   type: string
   default: ''
+- name: testIt
+  type: boolean
+  default: true
 
 steps:
 # We use two variables for feature flagging just because I'm worried about
@@ -48,19 +51,20 @@ steps:
     DEFAULT_FEATURES_FLAG: ${{ parameters.defaultFeatures }}
     EXPLICIT_FEATURES: ${{ parameters.explicitFeatures }}
 
-- bash: cargo build --all --release $CARGO_FEATURES_FLAGS --features="$CARGO_FEATURES_EXPLICIT" -v
-  displayName: "cargo build"
+- bash: cargo build --all --target $TARGET --release $CARGO_FEATURES_FLAGS --features="$CARGO_FEATURES_EXPLICIT" -v
+  displayName: cargo build for $(TARGET)
 
-- bash: cargo test --all --release $CARGO_FEATURES_FLAGS --features="$CARGO_FEATURES_EXPLICIT"
-  displayName: "cargo test"
+- ${{ if parameters.testIt }}:
+  - bash: cargo test --all --target $TARGET --release $CARGO_FEATURES_FLAGS --features="$CARGO_FEATURES_EXPLICIT"
+    displayName: cargo test
 
 # For non-canary builds, export artifacts.
 
 - ${{ if eq(parameters.canaryBuild, false) }}:
   - bash: |
       artifact_dir="$(Build.ArtifactStagingDirectory)/binary-$TARGET"
       mkdir -p "$artifact_dir"
-      cranko cargo package-released-binaries -t $TARGET $artifact_dir -- build --release
+      cranko cargo package-released-binaries -t $TARGET $artifact_dir -- build --target $TARGET --release
     displayName: Package binaries
 
   - task: PublishPipelineArtifact@1