diff options
| author | fanquake <fanquake@gmail.com> | 2023-10-09 14:12:50 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-10-09 14:13:29 +0100 |
| commit | f4674444b21184ee267675eba4886009b4ec619c (patch) | |
| tree | ba50e9931a3ddffcfb4691c420337455787c873e | |
| parent | 66f8ee2969dcfd5df13f5e33afa80cbc6ffef774 (diff) | |
| parent | fac88a874f57bfbedbaffaf43a01b3a74be8d875 (diff) | |
Merge bitcoin/bitcoin#28595: ci: Avoid cache depends/work/build
fac88a874f57bfbedbaffaf43a01b3a74be8d875 ci: Avoid cache depends/build (MarcoFalke)
Pull request description:
Fixes https://github.com/bitcoin/bitcoin/issues/28365 (maybe?)
ACKs for top commit:
hebasto:
ACK fac88a874f57bfbedbaffaf43a01b3a74be8d875
Tree-SHA512: c121f335f4b7d1f5f8f0508a17cee4d33dcf43c3928f9003a01dcc9ed0c45d1d912f7ff976e605b06c2f293ed21371d2dcace5562fe466bc444144790353bdd3
| -rwxr-xr-x | ci/test/04_install.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 01faf9fff9..b5a84ae08d 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -21,6 +21,8 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then "${BASE_READ_ONLY_DIR}" docker volume create "${CONTAINER_NAME}_ccache" || true docker volume create "${CONTAINER_NAME}_depends" || true + docker volume create "${CONTAINER_NAME}_depends_sources" || true + docker volume create "${CONTAINER_NAME}_depends_SDKs_android" || true docker volume create "${CONTAINER_NAME}_previous_releases" || true if [ -n "${RESTART_CI_DOCKER_BEFORE_RUN}" ] ; then @@ -36,7 +38,9 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then CI_CONTAINER_ID=$(docker run --cap-add LINUX_IMMUTABLE $CI_CONTAINER_CAP --rm --interactive --detach --tty \ --mount "type=bind,src=$BASE_READ_ONLY_DIR,dst=$BASE_READ_ONLY_DIR,readonly" \ --mount "type=volume,src=${CONTAINER_NAME}_ccache,dst=$CCACHE_DIR" \ - --mount "type=volume,src=${CONTAINER_NAME}_depends,dst=$DEPENDS_DIR" \ + --mount "type=volume,src=${CONTAINER_NAME}_depends,dst=$DEPENDS_DIR/built" \ + --mount "type=volume,src=${CONTAINER_NAME}_depends_sources,dst=$DEPENDS_DIR/sources" \ + --mount "type=volume,src=${CONTAINER_NAME}_depends_SDKs_android,dst=$DEPENDS_DIR/SDKs/android" \ --mount "type=volume,src=${CONTAINER_NAME}_previous_releases,dst=$PREVIOUS_RELEASES_DIR" \ --env-file /tmp/env \ --name "$CONTAINER_NAME" \ |