From 5a0193a414ce1bff285b2b9d6c87d3abbb0af774 Mon Sep 17 00:00:00 2001 From: Paul-Edouard Sarlin Date: Mon, 5 Feb 2024 23:09:41 +0100 Subject: [PATCH] Try GitHub Actions cache --- .github/workflows/build.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10fb834..0fa88c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: {os: windows-latest}, ] env: - COMPILER_CACHE_VERSION: 1 + COMPILER_CACHE_VERSION: 2 COMPILER_CACHE_DIR: ${{ github.workspace }}/compiler-cache steps: - uses: actions/checkout@v4 @@ -33,6 +33,12 @@ jobs: key: v${{ env.COMPILER_CACHE_VERSION }}-${{ matrix.config.os }}-${{ matrix.config.arch }}-${{ github.run_id }}-${{ github.run_number }} restore-keys: v${{ env.COMPILER_CACHE_VERSION }}-${{ matrix.config.os }}-${{ matrix.config.arch }} path: ${{ env.COMPILER_CACHE_DIR }} + - name: Export GitHub Actions cache environment variables + uses: actions/github-script@v6 + with: + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - name: Set env (macOS) if: runner.os == 'macOS' run: | @@ -59,8 +65,7 @@ jobs: echo "CIBW_CONFIG_SETTINGS_MACOS=${CONFIG_SETTINGS}" >> "$GITHUB_ENV" # vcpkg binary caching - VCPKG_CACHE_DIR="${COMPILER_CACHE_DIR}/vcpkg" - VCPKG_BINARY_SOURCES="clear;files,${VCPKG_CACHE_DIR},readwrite" + VCPKG_BINARY_SOURCES="clear;x-gha,readwrite" echo "VCPKG_BINARY_SOURCES=${VCPKG_BINARY_SOURCES}" >> "$GITHUB_ENV" - name: Set env (Windows) if: runner.os == 'Windows' @@ -82,8 +87,7 @@ jobs: echo "CIBW_REPAIR_WHEEL_COMMAND_WINDOWS=${CIBW_REPAIR_WHEEL_COMMAND}" >> "${env:GITHUB_ENV}" # vcpkg binary caching - $VCPKG_CACHE_DIR = "${env:COMPILER_CACHE_DIR}/vcpkg" - $VCPKG_BINARY_SOURCES = "clear;files,${VCPKG_CACHE_DIR},readwrite" + $VCPKG_BINARY_SOURCES = "clear;x-gha,readwrite" echo "VCPKG_BINARY_SOURCES=${VCPKG_BINARY_SOURCES}" >> "${env:GITHUB_ENV}" - name: Set env (Ubuntu) if: runner.os == 'Linux' @@ -108,8 +112,7 @@ jobs: echo "CONTAINER_COMPILER_CACHE_DIR=${CONTAINER_COMPILER_CACHE_DIR}" >> "$GITHUB_ENV" # vcpkg binary caching - VCPKG_CACHE_DIR="${CONTAINER_COMPILER_CACHE_DIR}/vcpkg" - VCPKG_BINARY_SOURCES="clear;files,${VCPKG_CACHE_DIR},readwrite" + VCPKG_BINARY_SOURCES="clear;x-gha,readwrite" echo "VCPKG_BINARY_SOURCES=${VCPKG_BINARY_SOURCES}" >> "$GITHUB_ENV" CIBW_ENVIRONMENT_PASS_LINUX="VCPKG_TARGET_TRIPLET VCPKG_INSTALLATION_ROOT CMAKE_TOOLCHAIN_FILE VCPKG_BINARY_SOURCES CONTAINER_COMPILER_CACHE_DIR"