diff --git a/.github/workflows/build-new.yml b/.github/workflows/build-new.yml index 8ce2b75..9ce278c 100644 --- a/.github/workflows/build-new.yml +++ b/.github/workflows/build-new.yml @@ -99,15 +99,19 @@ jobs: CONFIG_SETTINGS="${CONFIG_SETTINGS} cmake.define.VCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}" echo "CIBW_CONFIG_SETTINGS_LINUX=${CONFIG_SETTINGS}" >> "$GITHUB_ENV" - # vcpkg binary caching + # Remap caching paths to the container CONTAINER_COMPILER_CACHE_DIR="/compiler-cache" CIBW_CONTAINER_ENGINE="docker; create_args: -v ${COMPILER_CACHE_DIR}:${CONTAINER_COMPILER_CACHE_DIR}" echo "CIBW_CONTAINER_ENGINE=${CIBW_CONTAINER_ENGINE}" >> "$GITHUB_ENV" + echo "CCACHE_DIR=${CONTAINER_COMPILER_CACHE_DIR}/ccache" >> "$GITHUB_ENV" + echo "CCACHE_BASEDIR=/project" >> "$GITHUB_ENV" + + # vcpkg binary caching VCPKG_CACHE_DIR="${CONTAINER_COMPILER_CACHE_DIR}/vcpkg" VCPKG_BINARY_SOURCES="clear;files,${VCPKG_CACHE_DIR},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" + CIBW_ENVIRONMENT_PASS_LINUX="VCPKG_TARGET_TRIPLET VCPKG_INSTALLATION_ROOT CMAKE_TOOLCHAIN_FILE VCPKG_BINARY_SOURCES CCACHE_DIR CCACHE_BASEDIR" echo "CIBW_ENVIRONMENT_PASS_LINUX=${CIBW_ENVIRONMENT_PASS_LINUX}" >> "$GITHUB_ENV" - name: Build wheels uses: pypa/cibuildwheel@v2.16.2