Tweak actions (actix#1305)

* Add benchmark action * Fix Windows build
elliotekj · Jan 22, 2020 · 2e9ab06 · 2e9ab06
1 parent 3a5b62b
commit 2e9ab06
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 7 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -0,0 +1,42 @@
+name: Benchmark (Linux)
+
+on: [push, pull_request]
+
+jobs:
+  check_benchmark:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          profile: minimal
+          override: true
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with:
+          command: generate-lockfile
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-registry-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/git
+          key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache cargo build
+        uses: actions/cache@v1
+        with:
+          path: target
+          key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-build-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Check benchmark
+        uses: actions-rs/cargo@v1
+        with:
+          command: bench
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Generate Cargo.lock
         uses: actions-rs/cargo@v1
         with:
-          command: update
+          command: generate-lockfile
       - name: Cache cargo registry
         uses: actions/cache@v1
         with:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -3,6 +3,7 @@ name: CI (Windows)
 on: [push, pull_request]
 
 env:
+  VCPKG_HASH: 3f62e5d55d1a7d8905df35d5c441d6e9ad64ffdf
   VCPKGRS_DYNAMIC: 1
 
 jobs:
@@ -30,7 +31,7 @@ jobs:
       - name: Generate Cargo.lock
         uses: actions-rs/cargo@v1
         with:
-          command: update
+          command: generate-lockfile
       - name: Cache cargo registry
         uses: actions/cache@v1
         with:
@@ -50,14 +51,23 @@ jobs:
         uses: actions/cache@v1
         id: cache-vcpkg
         with:
-          path: C:\vcpkg
-          key: windows_x64-${{ matrix.version }}-vcpkg
+          path: vcpkg
+          key: windows_x64-${{ env.VCPKG_HASH }}-vcpkg
 
       - name: Install OpenSSL
         if: steps.cache-vcpkg.outputs.cache-hit != 'true'
+        shell: pwsh
         run: |
-          vcpkg integrate install
-          vcpkg install openssl:x64-windows
+          git clone https://github.com/Microsoft/vcpkg.git
+          cd vcpkg
+          git reset --hard $VCPKG_HASH
+          .\bootstrap-vcpkg.bat
+          .\vcpkg integrate install
+          .\vcpkg install openssl:x64-windows
+          Copy-Item .\installed\x64-windows\bin\libcrypto-1_1-x64.dll .\installed\x64-windows\bin\libcrypto.dll
+          Copy-Item .\installed\x64-windows\bin\libssl-1_1-x64.dll .\installed\x64-windows\bin\libssl.dll
+          Get-ChildItem .\installed\x64-windows\bin
+          Get-ChildItem .\installed\x64-windows\lib
 
       - name: check build
         uses: actions-rs/cargo@v1
@@ -76,4 +86,4 @@ jobs:
                 --skip=test_simple
                 --skip=test_expect_continue
                 --skip=test_http10_keepalive
-                --skip=test_slow_request 
+                --skip=test_slow_request