Use file based cache too

kou · Nov 6, 2024 · 641865f · 641865f
1 parent 78ee981
commit 641865f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ci/docker/python-wheel-manylinux.dockerfile b/ci/docker/python-wheel-manylinux.dockerfile
@@ -68,6 +68,7 @@ RUN /arrow/ci/scripts/install_ccache.sh ${ccache} /usr/local
 # Install vcpkg
 ARG ACTIONS_CACHE_URL
 ARG ACTIONS_RUNTIME_TOKEN
+ARG VCPKG_BINARY_SOURCES
 ARG vcpkg
 COPY ci/vcpkg/*.patch \
      ci/vcpkg/*linux*.cmake \
@@ -79,7 +80,7 @@ ARG build_type=release
 ENV ACTIONS_CACHE_URL="${ACTIONS_CACHE_URL}" \
     ACTIONS_RUNTIME_TOKEN="${ACTIONS_RUNTIME_TOKEN}" \
     CMAKE_BUILD_TYPE=${build_type} \
-    VCPKG_BINARY_SOURCES="clear;x-gha,readwrite" \
+    VCPKG_BINARY_SOURCES="${VCPKG_BINARY_SOURCES}" \
     VCPKG_DEFAULT_TRIPLET=${arch_short}-linux-static-${build_type} \
     VCPKG_FEATURE_FLAGS="manifests" \
     VCPKG_FORCE_SYSTEM_BINARIES=1 \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -78,6 +78,7 @@ x-vcpkg-build-args: &vcpkg-build-args
   vcpkg: ${VCPKG}
   ACTIONS_CACHE_URL:
   ACTIONS_RUNTIME_TOKEN:
+  VCPKG_BINARY_SOURCES: clear;x-gha,rw;files,/vcpkg-cache,rw
 
 # CPU/memory limit presets to pass to Docker.
 #
@@ -199,8 +200,12 @@ volumes:
     name: maven-cache
   python-wheel-manylinux2014-ccache:
     name: python-wheel-manylinux2014-ccache
+  python-wheel-manylinux2014-vcpkg-cache:
+    name: python-wheel-manylinux2014-vcpkg-cache
   python-wheel-manylinux-2-28-ccache:
     name: python-wheel-manylinux-2-28-ccache
+  python-wheel-manylinux-2-28-vcpkg-cache:
+    name: python-wheel-manylinux-2-28-vcpkg-ccache
   python-wheel-windows-clcache:
     name: python-wheel-windows-clcache
   ubuntu-ccache:
@@ -1141,6 +1146,7 @@ services:
     volumes:
       - .:/arrow:delegated
       - ${DOCKER_VOLUME_PREFIX}python-wheel-manylinux2014-ccache:/ccache:delegated
+      - ${DOCKER_VOLUME_PREFIX}python-wheel-manylinux2014-vcpkg-cache:/vcpkg-cache:delegated
     command: /arrow/ci/scripts/python_wheel_manylinux_build.sh
 
   # See available versions at:
@@ -1165,6 +1171,7 @@ services:
     volumes:
       - .:/arrow:delegated
       - ${DOCKER_VOLUME_PREFIX}python-wheel-manylinux-2-28-ccache:/ccache:delegated
+      - ${DOCKER_VOLUME_PREFIX}python-wheel-manylinux-2-28-vcpkg-cache:/vcpkg-ccache:delegated
     command: /arrow/ci/scripts/python_wheel_manylinux_build.sh
 
   python-wheel-manylinux-test-imports: