From 994eaf3d805b3739f01d4fbc56cbcff81a72b703 Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Thu, 15 Oct 2020 07:14:11 -0400 Subject: [PATCH 1/5] Update to latest version of cc --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 311e584ed2..4c129816c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -251,9 +251,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" +checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" [[package]] name = "cfb-mode" From c82687490e34f51ad3fd4dcfd5c0a1edff84547f Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Thu, 15 Oct 2020 07:16:23 -0400 Subject: [PATCH 2/5] Update to latest version of libc --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4c129816c7..5f20c5a864 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1045,9 +1045,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.76" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" +checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743" [[package]] name = "libm" From 87e5206e7d534680e3fe6cc7401e7f08d87175ab Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Thu, 15 Oct 2020 07:14:58 -0400 Subject: [PATCH 3/5] Update to latest version of libz --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5f20c5a864..0d42ec8267 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1057,9 +1057,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libz-sys" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af67924b8dd885cccea261866c8ce5b74d239d272e154053ff927dae839f5ae9" +checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" dependencies = [ "cc", "libc", From 32a6b9e39c1a049b840433f973de0c1ba21caa14 Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Thu, 15 Oct 2020 07:15:19 -0400 Subject: [PATCH 4/5] Update to latest version of openssl-src --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d42ec8267..013c2c2a67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1356,9 +1356,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-src" -version = "111.10.2+1.1.1g" +version = "111.12.0+1.1.1h" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" +checksum = "858a4132194f8570a7ee9eb8629e85b23cbc4565f2d4a162e87556e5956abf61" dependencies = [ "cc", ] From b46366ec690d890b2651dfff250d6de5db4137ee Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Wed, 14 Oct 2020 22:11:49 -0400 Subject: [PATCH 5/5] Build for aarch64-apple-darwin --- .github/workflows/macos-builds-on-all.yaml | 17 +++++++++++++++++ ci/actions-templates/README.md | 1 + ci/actions-templates/macos-builds-template.yaml | 17 +++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/.github/workflows/macos-builds-on-all.yaml b/.github/workflows/macos-builds-on-all.yaml index 71789563b9..f1d52de9b7 100644 --- a/.github/workflows/macos-builds-on-all.yaml +++ b/.github/workflows/macos-builds-on-all.yaml @@ -21,6 +21,7 @@ jobs: matrix: target: - x86_64-apple-darwin + - aarch64-apple-darwin steps: - uses: actions/checkout@v2 with: @@ -68,6 +69,22 @@ jobs: rustup toolchain uninstall stable fi rustup toolchain install --profile=minimal stable + - name: aarch64-specific items + run: | + # Use nightly for now + rustup toolchain install --profile=minimal nightly + rustup default nightly + + # Can't run tests: cross-compiling + echo "SKIP_TESTS=yes" >> $GITHUB_ENV + + # Use the beta compiler + sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer/ + + # Set SDK environment variables + echo "SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path)" >> $GITHUB_ENV + echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV + if: matrix.target == 'aarch64-apple-darwin' - name: Ensure we have our goal target installed run: | rustup target install "$TARGET" diff --git a/ci/actions-templates/README.md b/ci/actions-templates/README.md index 4281cd786f..767bc12315 100644 --- a/ci/actions-templates/README.md +++ b/ci/actions-templates/README.md @@ -59,6 +59,7 @@ system. | x86_64-linux-android | Yes | Two | No | No | | riscv64gc-unknown-linux-gnu | Yes | --- | No | No | | ----------------------------- | ---------- | ----- | ------ | ---------- | +| aarch64-apple-darwin | Yes | Two | Yes | Yes | | x86_64-apple-darwin | No | One | Yes | Yes | | ----------------------------- | ---------- | ----- | ------ | ---------- | | x86_64-pc-windows-msvc | No | One | Yes | Yes | diff --git a/ci/actions-templates/macos-builds-template.yaml b/ci/actions-templates/macos-builds-template.yaml index 71789563b9..f1d52de9b7 100644 --- a/ci/actions-templates/macos-builds-template.yaml +++ b/ci/actions-templates/macos-builds-template.yaml @@ -21,6 +21,7 @@ jobs: matrix: target: - x86_64-apple-darwin + - aarch64-apple-darwin steps: - uses: actions/checkout@v2 with: @@ -68,6 +69,22 @@ jobs: rustup toolchain uninstall stable fi rustup toolchain install --profile=minimal stable + - name: aarch64-specific items + run: | + # Use nightly for now + rustup toolchain install --profile=minimal nightly + rustup default nightly + + # Can't run tests: cross-compiling + echo "SKIP_TESTS=yes" >> $GITHUB_ENV + + # Use the beta compiler + sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer/ + + # Set SDK environment variables + echo "SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path)" >> $GITHUB_ENV + echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV + if: matrix.target == 'aarch64-apple-darwin' - name: Ensure we have our goal target installed run: | rustup target install "$TARGET"