From a807cd307b54098fa2149fc96db8d6a36b5987df Mon Sep 17 00:00:00 2001
From: zonyitoo <zonyitoo@gmail.com>
Date: Sat, 21 Nov 2020 22:14:10 +0800
Subject: [PATCH] crypto2 requires unstable simd and asm featurs, we have to
 build with nightly

---
 .github/workflows/build-and-test.yml | 24 +++++++++++++++---------
 .github/workflows/build-release.yml  | 14 ++++++++------
 build/build-host-release             |  4 ++--
 build/build-host-release.ps1         |  2 +-
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index cc51dbed..f65f55a5 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -24,12 +24,14 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install Rust nightly
+        run: rustup toolchain install nightly
       - name: Build & Test (Default)
-        run: cargo test --verbose --no-fail-fast
+        run: cargo +nightly test --verbose --no-fail-fast
       - name: Build & Test (--no-default-feature)
-        run: cargo test --verbose --no-default-feature --no-fail-fast
+        run: cargo +nightly test --verbose --no-default-feature --no-fail-fast
       - name: Build with All Features Enabled
-        run: cargo build --verbose --features "local-redir local-dns local-http-rustls dns-over-tls dns-over-https"
+        run: cargo +nightly build --verbose --features "local-redir local-dns local-http-rustls dns-over-tls dns-over-https"
 
   build-windows:
     runs-on: windows-latest
@@ -43,12 +45,14 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install Rust nightly
+        run: rustup toolchain install nightly
       - name: Build & Test (Default)
-        run: cargo test --verbose --no-fail-fast
+        run: cargo +nightly test --verbose --no-fail-fast
       - name: Build & Test (--no-default-feature)
-        run: cargo test --verbose --no-default-feature --no-fail-fast
+        run: cargo +nightly test --verbose --no-default-feature --no-fail-fast
       - name: Build with All Features Enabled
-        run: cargo build --verbose --features "local-dns local-http-rustls dns-over-tls dns-over-https"
+        run: cargo +nightly build --verbose --features "local-dns local-http-rustls dns-over-tls dns-over-https"
 
   build-macos:
     runs-on: macos-latest
@@ -67,9 +71,11 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install Rust nightly
+        run: rustup toolchain install nightly
       - name: Build & Test (Default)
-        run: cargo test --verbose --no-fail-fast
+        run: cargo +nightly test --verbose --no-fail-fast
       - name: Build & Test (--no-default-feature)
-        run: cargo test --verbose --no-default-feature --no-fail-fast
+        run: cargo +nightly test --verbose --no-default-feature --no-fail-fast
       - name: Build with All Features Enabled
-        run: cargo build --verbose --features "local-redir local-dns local-http-rustls dns-over-tls dns-over-https"
+        run: cargo +nightly build --verbose --features "local-redir local-dns local-http-rustls dns-over-tls dns-over-https"
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index f5652794..bed2a2e3 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -47,8 +47,7 @@ jobs:
   build-unix:
     runs-on: ${{ matrix.os }}
     env:
-      BUILD_EXTRA_FEATURES: "openssl-vendored local-redir"
-      RUSTFLAGS: "-Ctarget-feature=+aes,+ssse3"
+      BUILD_EXTRA_FEATURES: "local-redir"
     strategy:
       matrix:
         # os: [ubuntu-latest, macos-latest]
@@ -63,6 +62,9 @@ jobs:
           # echo "::add-path::/usr/local/opt/gnu-tar/libexec/gnubin"
           echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
 
+      - name: Install Rust nightly
+        run: rustup toolchain install nightly
+
       - name: Build release
         shell: bash
         run: |
@@ -80,13 +82,13 @@ jobs:
   build-windows:
     runs-on: windows-latest
     env:
-      RUSTFLAGS: "-Ctarget-feature=+aes,+ssse3,+crt-static"
-    # env:
-    #   OPENSSL_STATIC: "1"
-    #   OPENSSL_DIR: "C:\\Program Files\\OpenSSL-Win64\\"
+      RUSTFLAGS: "-Ctarget-feature=+crt-static"
     steps:
       - uses: actions/checkout@v2
 
+      - name: Install Rust nightly
+        run: rustup toolchain install nightly
+
       - name: Build release
         run: |
           cd build
diff --git a/build/build-host-release b/build/build-host-release
index d0d0637a..75c4b870 100755
--- a/build/build-host-release
+++ b/build/build-host-release
@@ -19,9 +19,9 @@ HOST_TRIPLE=$(rustc -Vv | grep 'host:' | awk '{print $2}')
 echo "Started build release for ${HOST_TRIPLE} ..."
 
 if [[ "${BUILD_TARGET}" != "" ]]; then
-    cargo build --release --features "aes-pmac-siv ${BUILD_EXTRA_FEATURES}" --target "${BUILD_TARGET}"
+    cargo +nightly build --release --features "${BUILD_EXTRA_FEATURES}" --target "${BUILD_TARGET}"
 else
-    cargo build --release --features "aes-pmac-siv ${BUILD_EXTRA_FEATURES}"
+    cargo +nightly build --release --features "${BUILD_EXTRA_FEATURES}"
 fi
 
 if [[ "$?" != "0" ]]; then
diff --git a/build/build-host-release.ps1 b/build/build-host-release.ps1
index e3b57b6b..27306708 100644
--- a/build/build-host-release.ps1
+++ b/build/build-host-release.ps1
@@ -10,7 +10,7 @@ $TargetTriple = (rustc -Vv | Select-String -Pattern "host: (.*)" | ForEach-Objec
 
 Write-Host "Started building release for ${TargetTriple} ..."
 
-cargo build --release --features "aes-pmac-siv openssl-vendored"
+cargo +nightly build --release
 if (!$?) {
     exit $LASTEXITCODE
 }