From a6da13ffc78f94daafdae97e387131682b9d24c1 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 7 Feb 2021 15:07:41 +1300 Subject: [PATCH] fix cache ordering --- .github/dependabot.yml | 2 +- .github/workflows/rust.yml | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5f8b768d..5e4980b5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,5 +5,5 @@ updates: - package-ecosystem: "cargo" directory: "/" schedule: - interval: "daily" + interval: "weekly" diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 03ec4e89..2e1a7cdb 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -43,16 +43,21 @@ jobs: target: ${{ matrix.target }} override: true - - name: Configure caching + - name: Configure cargo caching uses: actions/cache@v2 - # Caching disabled on macos due to https://github.com/actions/cache/issues/403 - if: ${{ matrix.os != 'macos-latest' }} with: key: ${{ matrix.os }}-${{ matrix.target }} path: | ${{ env.HOME }}/.cargo" target + - name: Configure vcpkg caching + if: ${{ matrix.os == 'windows-latest' }} + uses: actions/cache@v2 + with: + key: ${{ matrix.os }}-${{ matrix.target }} + path: C:/vcpkg + - name: Install openssl (apt armv7) if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }} uses: ryankurte/action-apt@v0.3.0 @@ -79,13 +84,6 @@ jobs: echo "OPENSSL_ROOT_DIR=C:/vcpkg/installed/x64-windows-static/" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append echo "OPENSSL_STATIC=1" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append - - name: Cache vcpkg - if: ${{ matrix.os == 'windows-latest' }} - uses: actions/cache@v2 - with: - key: ${{ matrix.os }}-${{ matrix.target }} - path: C:/vcpkg - - name: Build release uses: actions-rs/cargo@v1 with: