From 5fe77bfc90502a0f964a1d865eb480ed2a4bb52f Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 4 May 2022 08:42:09 +0000 Subject: [PATCH] Isolate intermediate Cirrus caches by PR number Should decrease risk of race conditions when we have multiple builds happening at once. --- .cirrus.yml | 1076 +++++++++++++++++++++++---------- tools/cirrus_build_project.sh | 19 + tools/cirrus_gen_yml.sh | 94 ++- 3 files changed, 844 insertions(+), 345 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6325e53..b647007 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,34 +8,62 @@ release_linux_x86_64_download_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_x86_64_cache: + out_release_linux_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_x86_64" + - "echo out_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_x86_64_cache: + out1_release_linux_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_x86_64" + - "echo out1_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_x86_64_cache: + out2_release_linux_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_x86_64" + - "echo out2_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_x86_64_cache: + out3_release_linux_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_x86_64" + - "echo out3_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" + out_release_linux_x86_64_cache: + folder: out_global + fingerprint_script: + - "echo out_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_linux_x86_64_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_linux_x86_64_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_linux_x86_64_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -80,31 +108,31 @@ release_linux_x86_64_gcc_para1_task: cpu: 8 memory: 16G timeout_in: 120m - out_release_linux_x86_64_cache: + out_release_linux_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_x86_64" + - "echo out_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_x86_64_cache: + out1_release_linux_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_x86_64" + - "echo out1_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_x86_64_cache: + out2_release_linux_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_x86_64" + - "echo out2_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_x86_64_cache: + out3_release_linux_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_x86_64" + - "echo out3_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -161,31 +189,31 @@ release_linux_x86_64_goeasyconfig_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_x86_64_cache: + out_release_linux_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_x86_64" + - "echo out_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_x86_64_cache: + out1_release_linux_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_x86_64" + - "echo out1_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_x86_64_cache: + out2_release_linux_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_x86_64" + - "echo out2_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_x86_64_cache: + out3_release_linux_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_x86_64" + - "echo out3_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -242,31 +270,31 @@ release_linux_x86_64_ncdns_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_x86_64_cache: + out_release_linux_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_x86_64" + - "echo out_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_x86_64_cache: + out1_release_linux_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_x86_64" + - "echo out1_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_x86_64_cache: + out2_release_linux_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_x86_64" + - "echo out2_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_x86_64_cache: + out3_release_linux_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_x86_64" + - "echo out3_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -323,31 +351,31 @@ release_linux_x86_64_ncprop279_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_x86_64_cache: + out_release_linux_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_x86_64" + - "echo out_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_x86_64_cache: + out1_release_linux_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_x86_64" + - "echo out1_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_x86_64_cache: + out2_release_linux_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_x86_64" + - "echo out2_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_x86_64_cache: + out3_release_linux_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_x86_64" + - "echo out3_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -404,31 +432,31 @@ release_linux_x86_64_plain-binaries_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_x86_64_cache: + out_release_linux_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_x86_64" + - "echo out_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_x86_64_cache: + out1_release_linux_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_x86_64" + - "echo out1_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_x86_64_cache: + out2_release_linux_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_x86_64" + - "echo out2_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_x86_64_cache: + out3_release_linux_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_x86_64" + - "echo out3_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -485,31 +513,31 @@ release_linux_x86_64_release_nosign_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_x86_64_cache: + out_release_linux_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_x86_64" + - "echo out_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_x86_64_cache: + out1_release_linux_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_x86_64" + - "echo out1_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_x86_64_cache: + out2_release_linux_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_x86_64" + - "echo out2_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_x86_64_cache: + out3_release_linux_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_x86_64" + - "echo out3_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -542,6 +570,34 @@ release_linux_x86_64_release_nosign_task: fingerprint_script: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true + out_release_linux_x86_64_cache: + folder: out_global + fingerprint_script: + - "echo out_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_linux_x86_64_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_linux_x86_64_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_linux_x86_64_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. @@ -569,31 +625,31 @@ release_linux_x86_64_release_sign_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_x86_64_cache: + out_release_linux_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_x86_64" + - "echo out_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_x86_64_cache: + out1_release_linux_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_x86_64" + - "echo out1_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_x86_64_cache: + out2_release_linux_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_x86_64" + - "echo out2_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_x86_64_cache: + out3_release_linux_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_x86_64" + - "echo out3_release_linux_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -626,6 +682,34 @@ release_linux_x86_64_release_sign_task: fingerprint_script: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true + out_release_linux_x86_64_cache: + folder: out_global + fingerprint_script: + - "echo out_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_linux_x86_64_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_linux_x86_64_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_linux_x86_64_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. @@ -655,34 +739,62 @@ release_linux_i686_download_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_i686_cache: + out_release_linux_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_i686" + - "echo out_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_i686_cache: + out1_release_linux_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_i686" + - "echo out1_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_i686_cache: + out2_release_linux_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_i686" + - "echo out2_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_i686_cache: + out3_release_linux_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_i686" + - "echo out3_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" + out_release_linux_i686_cache: + folder: out_global + fingerprint_script: + - "echo out_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_linux_i686_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_linux_i686_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_linux_i686_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -727,31 +839,31 @@ release_linux_i686_gcc_para1_task: cpu: 8 memory: 16G timeout_in: 120m - out_release_linux_i686_cache: + out_release_linux_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_i686" + - "echo out_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_i686_cache: + out1_release_linux_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_i686" + - "echo out1_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_i686_cache: + out2_release_linux_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_i686" + - "echo out2_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_i686_cache: + out3_release_linux_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_i686" + - "echo out3_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -808,31 +920,31 @@ release_linux_i686_goeasyconfig_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_i686_cache: + out_release_linux_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_i686" + - "echo out_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_i686_cache: + out1_release_linux_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_i686" + - "echo out1_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_i686_cache: + out2_release_linux_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_i686" + - "echo out2_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_i686_cache: + out3_release_linux_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_i686" + - "echo out3_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -889,31 +1001,31 @@ release_linux_i686_ncdns_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_i686_cache: + out_release_linux_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_i686" + - "echo out_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_i686_cache: + out1_release_linux_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_i686" + - "echo out1_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_i686_cache: + out2_release_linux_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_i686" + - "echo out2_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_i686_cache: + out3_release_linux_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_i686" + - "echo out3_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -970,31 +1082,31 @@ release_linux_i686_ncprop279_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_i686_cache: + out_release_linux_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_i686" + - "echo out_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_i686_cache: + out1_release_linux_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_i686" + - "echo out1_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_i686_cache: + out2_release_linux_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_i686" + - "echo out2_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_i686_cache: + out3_release_linux_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_i686" + - "echo out3_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1051,31 +1163,31 @@ release_linux_i686_plain-binaries_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_i686_cache: + out_release_linux_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_i686" + - "echo out_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_i686_cache: + out1_release_linux_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_i686" + - "echo out1_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_i686_cache: + out2_release_linux_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_i686" + - "echo out2_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_i686_cache: + out3_release_linux_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_i686" + - "echo out3_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1132,31 +1244,31 @@ release_linux_i686_release_nosign_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_i686_cache: + out_release_linux_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_i686" + - "echo out_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_i686_cache: + out1_release_linux_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_i686" + - "echo out1_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_i686_cache: + out2_release_linux_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_i686" + - "echo out2_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_i686_cache: + out3_release_linux_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_i686" + - "echo out3_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1189,6 +1301,34 @@ release_linux_i686_release_nosign_task: fingerprint_script: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true + out_release_linux_i686_cache: + folder: out_global + fingerprint_script: + - "echo out_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_linux_i686_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_linux_i686_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_linux_i686_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. @@ -1216,31 +1356,31 @@ release_linux_i686_release_sign_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_linux_i686_cache: + out_release_linux_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_linux_i686" + - "echo out_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_linux_i686_cache: + out1_release_linux_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_linux_i686" + - "echo out1_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_linux_i686_cache: + out2_release_linux_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_linux_i686" + - "echo out2_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_linux_i686_cache: + out3_release_linux_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_linux_i686" + - "echo out3_release_linux_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1273,6 +1413,34 @@ release_linux_i686_release_sign_task: fingerprint_script: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true + out_release_linux_i686_cache: + folder: out_global + fingerprint_script: + - "echo out_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_linux_i686_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_linux_i686_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_linux_i686_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. @@ -1302,34 +1470,62 @@ release_windows_x86_64_download_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_x86_64_cache: + out_release_windows_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_x86_64" + - "echo out_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_x86_64_cache: + out1_release_windows_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_x86_64" + - "echo out1_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_x86_64_cache: + out2_release_windows_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_x86_64" + - "echo out2_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_x86_64_cache: + out3_release_windows_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_x86_64" + - "echo out3_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" + out_release_windows_x86_64_cache: + folder: out_global + fingerprint_script: + - "echo out_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_windows_x86_64_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_windows_x86_64_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_windows_x86_64_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1374,31 +1570,31 @@ release_windows_x86_64_mingw-w64_para1_task: cpu: 8 memory: 16G timeout_in: 120m - out_release_windows_x86_64_cache: + out_release_windows_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_x86_64" + - "echo out_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_x86_64_cache: + out1_release_windows_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_x86_64" + - "echo out1_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_x86_64_cache: + out2_release_windows_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_x86_64" + - "echo out2_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_x86_64_cache: + out3_release_windows_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_x86_64" + - "echo out3_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1455,31 +1651,31 @@ release_windows_x86_64_goeasyconfig_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_x86_64_cache: + out_release_windows_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_x86_64" + - "echo out_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_x86_64_cache: + out1_release_windows_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_x86_64" + - "echo out1_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_x86_64_cache: + out2_release_windows_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_x86_64" + - "echo out2_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_x86_64_cache: + out3_release_windows_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_x86_64" + - "echo out3_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1536,31 +1732,31 @@ release_windows_x86_64_ncdns_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_x86_64_cache: + out_release_windows_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_x86_64" + - "echo out_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_x86_64_cache: + out1_release_windows_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_x86_64" + - "echo out1_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_x86_64_cache: + out2_release_windows_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_x86_64" + - "echo out2_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_x86_64_cache: + out3_release_windows_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_x86_64" + - "echo out3_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1617,31 +1813,31 @@ release_windows_x86_64_ncprop279_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_x86_64_cache: + out_release_windows_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_x86_64" + - "echo out_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_x86_64_cache: + out1_release_windows_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_x86_64" + - "echo out1_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_x86_64_cache: + out2_release_windows_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_x86_64" + - "echo out2_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_x86_64_cache: + out3_release_windows_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_x86_64" + - "echo out3_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1698,31 +1894,31 @@ release_windows_x86_64_plain-binaries_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_x86_64_cache: + out_release_windows_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_x86_64" + - "echo out_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_x86_64_cache: + out1_release_windows_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_x86_64" + - "echo out1_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_x86_64_cache: + out2_release_windows_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_x86_64" + - "echo out2_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_x86_64_cache: + out3_release_windows_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_x86_64" + - "echo out3_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1779,31 +1975,31 @@ release_windows_x86_64_release_nosign_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_x86_64_cache: + out_release_windows_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_x86_64" + - "echo out_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_x86_64_cache: + out1_release_windows_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_x86_64" + - "echo out1_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_x86_64_cache: + out2_release_windows_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_x86_64" + - "echo out2_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_x86_64_cache: + out3_release_windows_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_x86_64" + - "echo out3_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1836,6 +2032,34 @@ release_windows_x86_64_release_nosign_task: fingerprint_script: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true + out_release_windows_x86_64_cache: + folder: out_global + fingerprint_script: + - "echo out_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_windows_x86_64_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_windows_x86_64_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_windows_x86_64_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. @@ -1863,31 +2087,31 @@ release_windows_x86_64_release_sign_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_x86_64_cache: + out_release_windows_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_x86_64" + - "echo out_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_x86_64_cache: + out1_release_windows_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_x86_64" + - "echo out1_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_x86_64_cache: + out2_release_windows_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_x86_64" + - "echo out2_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_x86_64_cache: + out3_release_windows_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_x86_64" + - "echo out3_release_windows_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -1920,6 +2144,34 @@ release_windows_x86_64_release_sign_task: fingerprint_script: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true + out_release_windows_x86_64_cache: + folder: out_global + fingerprint_script: + - "echo out_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_windows_x86_64_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_windows_x86_64_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_windows_x86_64_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. @@ -1949,34 +2201,62 @@ release_windows_i686_download_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_i686_cache: + out_release_windows_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_i686" + - "echo out_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_i686_cache: + out1_release_windows_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_i686" + - "echo out1_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_i686_cache: + out2_release_windows_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_i686" + - "echo out2_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_i686_cache: + out3_release_windows_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_i686" + - "echo out3_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" + out_release_windows_i686_cache: + folder: out_global + fingerprint_script: + - "echo out_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_windows_i686_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_windows_i686_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_windows_i686_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -2021,31 +2301,31 @@ release_windows_i686_mingw-w64_para1_task: cpu: 8 memory: 16G timeout_in: 120m - out_release_windows_i686_cache: + out_release_windows_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_i686" + - "echo out_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_i686_cache: + out1_release_windows_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_i686" + - "echo out1_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_i686_cache: + out2_release_windows_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_i686" + - "echo out2_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_i686_cache: + out3_release_windows_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_i686" + - "echo out3_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2102,31 +2382,31 @@ release_windows_i686_goeasyconfig_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_i686_cache: + out_release_windows_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_i686" + - "echo out_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_i686_cache: + out1_release_windows_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_i686" + - "echo out1_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_i686_cache: + out2_release_windows_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_i686" + - "echo out2_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_i686_cache: + out3_release_windows_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_i686" + - "echo out3_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2183,31 +2463,31 @@ release_windows_i686_ncdns_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_i686_cache: + out_release_windows_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_i686" + - "echo out_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_i686_cache: + out1_release_windows_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_i686" + - "echo out1_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_i686_cache: + out2_release_windows_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_i686" + - "echo out2_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_i686_cache: + out3_release_windows_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_i686" + - "echo out3_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2264,31 +2544,31 @@ release_windows_i686_ncprop279_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_i686_cache: + out_release_windows_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_i686" + - "echo out_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_i686_cache: + out1_release_windows_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_i686" + - "echo out1_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_i686_cache: + out2_release_windows_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_i686" + - "echo out2_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_i686_cache: + out3_release_windows_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_i686" + - "echo out3_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2345,31 +2625,31 @@ release_windows_i686_plain-binaries_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_i686_cache: + out_release_windows_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_i686" + - "echo out_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_i686_cache: + out1_release_windows_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_i686" + - "echo out1_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_i686_cache: + out2_release_windows_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_i686" + - "echo out2_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_i686_cache: + out3_release_windows_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_i686" + - "echo out3_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2426,31 +2706,31 @@ release_windows_i686_release_nosign_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_i686_cache: + out_release_windows_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_i686" + - "echo out_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_i686_cache: + out1_release_windows_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_i686" + - "echo out1_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_i686_cache: + out2_release_windows_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_i686" + - "echo out2_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_i686_cache: + out3_release_windows_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_i686" + - "echo out3_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2483,6 +2763,34 @@ release_windows_i686_release_nosign_task: fingerprint_script: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true + out_release_windows_i686_cache: + folder: out_global + fingerprint_script: + - "echo out_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_windows_i686_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_windows_i686_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_windows_i686_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. @@ -2510,31 +2818,31 @@ release_windows_i686_release_sign_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_windows_i686_cache: + out_release_windows_i686_local_cache: folder: out fingerprint_script: - - "echo out_release_windows_i686" + - "echo out_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_windows_i686_cache: + out1_release_windows_i686_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_windows_i686" + - "echo out1_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_windows_i686_cache: + out2_release_windows_i686_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_windows_i686" + - "echo out2_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_windows_i686_cache: + out3_release_windows_i686_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_windows_i686" + - "echo out3_release_windows_i686_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2567,6 +2875,34 @@ release_windows_i686_release_sign_task: fingerprint_script: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true + out_release_windows_i686_cache: + folder: out_global + fingerprint_script: + - "echo out_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_windows_i686_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_windows_i686_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_windows_i686_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. @@ -2596,34 +2932,62 @@ release_osx_x86_64_download_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_osx_x86_64_cache: + out_release_osx_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_osx_x86_64" + - "echo out_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_osx_x86_64_cache: + out1_release_osx_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_osx_x86_64" + - "echo out1_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_osx_x86_64_cache: + out2_release_osx_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_osx_x86_64" + - "echo out2_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_osx_x86_64_cache: + out3_release_osx_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_osx_x86_64" + - "echo out3_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" + out_release_osx_x86_64_cache: + folder: out_global + fingerprint_script: + - "echo out_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_osx_x86_64_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_osx_x86_64_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_osx_x86_64_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: @@ -2668,31 +3032,31 @@ release_osx_x86_64_clang_osx-para1_task: cpu: 8 memory: 16G timeout_in: 120m - out_release_osx_x86_64_cache: + out_release_osx_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_osx_x86_64" + - "echo out_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_osx_x86_64_cache: + out1_release_osx_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_osx_x86_64" + - "echo out1_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_osx_x86_64_cache: + out2_release_osx_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_osx_x86_64" + - "echo out2_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_osx_x86_64_cache: + out3_release_osx_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_osx_x86_64" + - "echo out3_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2749,31 +3113,31 @@ release_osx_x86_64_macosx-toolchain_para1_task: cpu: 8 memory: 16G timeout_in: 120m - out_release_osx_x86_64_cache: + out_release_osx_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_osx_x86_64" + - "echo out_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_osx_x86_64_cache: + out1_release_osx_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_osx_x86_64" + - "echo out1_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_osx_x86_64_cache: + out2_release_osx_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_osx_x86_64" + - "echo out2_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_osx_x86_64_cache: + out3_release_osx_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_osx_x86_64" + - "echo out3_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2830,31 +3194,31 @@ release_osx_x86_64_goeasyconfig_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_osx_x86_64_cache: + out_release_osx_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_osx_x86_64" + - "echo out_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_osx_x86_64_cache: + out1_release_osx_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_osx_x86_64" + - "echo out1_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_osx_x86_64_cache: + out2_release_osx_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_osx_x86_64" + - "echo out2_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_osx_x86_64_cache: + out3_release_osx_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_osx_x86_64" + - "echo out3_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2911,31 +3275,31 @@ release_osx_x86_64_ncdns_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_osx_x86_64_cache: + out_release_osx_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_osx_x86_64" + - "echo out_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_osx_x86_64_cache: + out1_release_osx_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_osx_x86_64" + - "echo out1_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_osx_x86_64_cache: + out2_release_osx_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_osx_x86_64" + - "echo out2_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_osx_x86_64_cache: + out3_release_osx_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_osx_x86_64" + - "echo out3_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -2992,31 +3356,31 @@ release_osx_x86_64_ncprop279_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_osx_x86_64_cache: + out_release_osx_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_osx_x86_64" + - "echo out_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_osx_x86_64_cache: + out1_release_osx_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_osx_x86_64" + - "echo out1_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_osx_x86_64_cache: + out2_release_osx_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_osx_x86_64" + - "echo out2_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_osx_x86_64_cache: + out3_release_osx_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_osx_x86_64" + - "echo out3_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -3073,31 +3437,31 @@ release_osx_x86_64_plain-binaries_1_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_osx_x86_64_cache: + out_release_osx_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_osx_x86_64" + - "echo out_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_osx_x86_64_cache: + out1_release_osx_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_osx_x86_64" + - "echo out1_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_osx_x86_64_cache: + out2_release_osx_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_osx_x86_64" + - "echo out2_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_osx_x86_64_cache: + out3_release_osx_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_osx_x86_64" + - "echo out3_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -3154,31 +3518,31 @@ release_osx_x86_64_release_nosign_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_osx_x86_64_cache: + out_release_osx_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_osx_x86_64" + - "echo out_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_osx_x86_64_cache: + out1_release_osx_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_osx_x86_64" + - "echo out1_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_osx_x86_64_cache: + out2_release_osx_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_osx_x86_64" + - "echo out2_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_osx_x86_64_cache: + out3_release_osx_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_osx_x86_64" + - "echo out3_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -3211,6 +3575,34 @@ release_osx_x86_64_release_nosign_task: fingerprint_script: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true + out_release_osx_x86_64_cache: + folder: out_global + fingerprint_script: + - "echo out_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_osx_x86_64_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_osx_x86_64_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_osx_x86_64_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. @@ -3238,31 +3630,31 @@ release_osx_x86_64_release_sign_task: cpu: 1 memory: 3G timeout_in: 120m - out_release_osx_x86_64_cache: + out_release_osx_x86_64_local_cache: folder: out fingerprint_script: - - "echo out_release_osx_x86_64" + - "echo out_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out" - out1_release_osx_x86_64_cache: + out1_release_osx_x86_64_local_cache: folder: out_cache1 fingerprint_script: - - "echo out1_release_osx_x86_64" + - "echo out1_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache1" - out2_release_osx_x86_64_cache: + out2_release_osx_x86_64_local_cache: folder: out_cache2 fingerprint_script: - - "echo out2_release_osx_x86_64" + - "echo out2_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache2" - out3_release_osx_x86_64_cache: + out3_release_osx_x86_64_local_cache: folder: out_cache3 fingerprint_script: - - "echo out3_release_osx_x86_64" + - "echo out3_release_osx_x86_64_${CIRRUS_PR}" reupload_on_changes: true populate_script: - "mkdir -p out_cache3" @@ -3295,6 +3687,34 @@ release_osx_x86_64_release_sign_task: fingerprint_script: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true + out_release_osx_x86_64_cache: + folder: out_global + fingerprint_script: + - "echo out_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_global" + out1_release_osx_x86_64_cache: + folder: out_cache1_global + fingerprint_script: + - "echo out1_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1_global" + out2_release_osx_x86_64_cache: + folder: out_cache2_global + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2_global" + out3_release_osx_x86_64_cache: + folder: out_cache3_global + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3_global" checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. diff --git a/tools/cirrus_build_project.sh b/tools/cirrus_build_project.sh index 6cda87a..bb99fc9 100755 --- a/tools/cirrus_build_project.sh +++ b/tools/cirrus_build_project.sh @@ -45,6 +45,14 @@ if [[ "$BUMP_DEPS" -eq 1 ]]; then exit 0 fi +if [[ "$SHOULD_BUILD" -eq 0 ]]; then + echo "Localizing caches..." + cp -a ./out_global/* ./out/ || true + cp -a ./out_cache1_global/* ./out/ || true + cp -a ./out_cache2_global/* ./out/ || true + cp -a ./out_cache3_global/* ./out/ || true +fi + echo "Restoring caches..." cp -a ./out_cache1/* ./out/ || true cp -a ./out_cache2/* ./out/ || true @@ -130,6 +138,17 @@ rm -rf ./out/encaya ./out/gocrosssign ./out/gosafetlsa ./out/q || true rm -rf ./out/macosx-toolchain || true rm -rf ./out/plain-binaries || true +if [[ "$PROJECT" == "release" ]]; then + echo "Globalizing caches..." + rm -rf ./out_global ./out_cache1_global ./out_cache2_global ./out_cache3_global + mv ./out ./out_global + mv ./out_cache1 ./out_cache1_global + mv ./out_cache2 ./out_cache2_global + mv ./out_cache3 ./out_cache3_global + mkdir ./out ./out_cache1 ./out_cache2 ./out_cache3 + touch ./out/.dummy ./out_cache1/.dummy ./out_cache2/.dummy ./out_cache3/.dummy +fi + echo "Packing git cache..." ./tools/cirrus_pack_git.sh || true diff --git a/tools/cirrus_gen_yml.sh b/tools/cirrus_gen_yml.sh index 2cd8943..18c9bd1 100755 --- a/tools/cirrus_gen_yml.sh +++ b/tools/cirrus_gen_yml.sh @@ -16,34 +16,62 @@ print_os_arch () { cpu: 1 memory: 3G timeout_in: 120m - out_${CHANNEL}_${OS}_${ARCH}_cache: + out_${CHANNEL}_${OS}_${ARCH}_local_cache: folder: out fingerprint_script: - - \"echo out_${CHANNEL}_${OS}_${ARCH}\" + - \"echo out_${CHANNEL}_${OS}_${ARCH}_\${CIRRUS_PR}\" reupload_on_changes: true populate_script: - \"mkdir -p out\" - out1_${CHANNEL}_${OS}_${ARCH}_cache: + out1_${CHANNEL}_${OS}_${ARCH}_local_cache: folder: out_cache1 fingerprint_script: - - \"echo out1_${CHANNEL}_${OS}_${ARCH}\" + - \"echo out1_${CHANNEL}_${OS}_${ARCH}_\${CIRRUS_PR}\" reupload_on_changes: true populate_script: - \"mkdir -p out_cache1\" - out2_${CHANNEL}_${OS}_${ARCH}_cache: + out2_${CHANNEL}_${OS}_${ARCH}_local_cache: folder: out_cache2 fingerprint_script: - - \"echo out2_${CHANNEL}_${OS}_${ARCH}\" + - \"echo out2_${CHANNEL}_${OS}_${ARCH}_\${CIRRUS_PR}\" reupload_on_changes: true populate_script: - \"mkdir -p out_cache2\" - out3_${CHANNEL}_${OS}_${ARCH}_cache: + out3_${CHANNEL}_${OS}_${ARCH}_local_cache: folder: out_cache3 fingerprint_script: - - \"echo out3_${CHANNEL}_${OS}_${ARCH}\" + - \"echo out3_${CHANNEL}_${OS}_${ARCH}_\${CIRRUS_PR}\" reupload_on_changes: true populate_script: - \"mkdir -p out_cache3\" + out_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_global + fingerprint_script: + - \"echo out_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_global\" + out1_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_cache1_global + fingerprint_script: + - \"echo out1_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_cache1_global\" + out2_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_cache2_global + fingerprint_script: + - \"echo out2_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_cache2_global\" + out3_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_cache3_global + fingerprint_script: + - \"echo out3_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_cache3_global\" git_${CHANNEL}_${OS}_${ARCH}_cache: folder: git_clones fingerprint_script: @@ -127,31 +155,31 @@ print_os_arch () { cpu: ${PARA_THREADS} memory: ${PARA_RAM}G timeout_in: 120m - out_${CHANNEL}_${OS}_${ARCH}_cache: + out_${CHANNEL}_${OS}_${ARCH}_local_cache: folder: out fingerprint_script: - - \"echo out_${CHANNEL}_${OS}_${ARCH}\" + - \"echo out_${CHANNEL}_${OS}_${ARCH}_\${CIRRUS_PR}\" reupload_on_changes: true populate_script: - \"mkdir -p out\" - out1_${CHANNEL}_${OS}_${ARCH}_cache: + out1_${CHANNEL}_${OS}_${ARCH}_local_cache: folder: out_cache1 fingerprint_script: - - \"echo out1_${CHANNEL}_${OS}_${ARCH}\" + - \"echo out1_${CHANNEL}_${OS}_${ARCH}_\${CIRRUS_PR}\" reupload_on_changes: true populate_script: - \"mkdir -p out_cache1\" - out2_${CHANNEL}_${OS}_${ARCH}_cache: + out2_${CHANNEL}_${OS}_${ARCH}_local_cache: folder: out_cache2 fingerprint_script: - - \"echo out2_${CHANNEL}_${OS}_${ARCH}\" + - \"echo out2_${CHANNEL}_${OS}_${ARCH}_\${CIRRUS_PR}\" reupload_on_changes: true populate_script: - \"mkdir -p out_cache2\" - out3_${CHANNEL}_${OS}_${ARCH}_cache: + out3_${CHANNEL}_${OS}_${ARCH}_local_cache: folder: out_cache3 fingerprint_script: - - \"echo out3_${CHANNEL}_${OS}_${ARCH}\" + - \"echo out3_${CHANNEL}_${OS}_${ARCH}_\${CIRRUS_PR}\" reupload_on_changes: true populate_script: - \"mkdir -p out_cache3\" @@ -183,8 +211,40 @@ print_os_arch () { folder: tmp/interrupted_dirs.tar.gz.partac.folder fingerprint_script: - \"echo interrupted_ac_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true" + + if [[ "$PROJECT_BASE" == "release" ]]; then + echo " out_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_global + fingerprint_script: + - \"echo out_${CHANNEL}_${OS}_${ARCH}\" reupload_on_changes: true - checkpoint_background_script: + populate_script: + - \"mkdir -p out_global\" + out1_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_cache1_global + fingerprint_script: + - \"echo out1_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_cache1_global\" + out2_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_cache2_global + fingerprint_script: + - \"echo out2_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_cache2_global\" + out3_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_cache3_global + fingerprint_script: + - \"echo out3_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_cache3_global\"" + fi + + echo " checkpoint_background_script: # 110m caused the 2hr task timeout to be hit while the cache was uploading # for macosx-toolchain, which broke subsequent builds. - sleep 105m