diff --git a/.cirrus.yml b/.cirrus.yml index 8972c60..3598767 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -16,6 +16,20 @@ release_linux_x86_64_download_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -66,6 +80,20 @@ release_linux_x86_64_gcc_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -123,6 +151,20 @@ release_linux_x86_64_gcc_2_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -180,6 +222,20 @@ release_linux_x86_64_goeasyconfig_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -237,6 +293,20 @@ release_linux_x86_64_ncdns_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -294,6 +364,20 @@ release_linux_x86_64_ncp11_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -351,6 +435,20 @@ release_linux_x86_64_ncprop279_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -408,6 +506,20 @@ release_linux_x86_64_plain-binaries_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -465,6 +577,20 @@ release_linux_x86_64_release_nosign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -525,6 +651,20 @@ release_linux_x86_64_release_sign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_x86_64_cache: folder: git_clones fingerprint_script: @@ -587,6 +727,20 @@ release_linux_i686_download_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -637,6 +791,20 @@ release_linux_i686_gcc_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -694,6 +862,20 @@ release_linux_i686_gcc_2_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -751,6 +933,20 @@ release_linux_i686_goeasyconfig_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -808,6 +1004,20 @@ release_linux_i686_ncdns_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -865,6 +1075,20 @@ release_linux_i686_ncp11_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -922,6 +1146,20 @@ release_linux_i686_ncprop279_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -979,6 +1217,20 @@ release_linux_i686_plain-binaries_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -1036,6 +1288,20 @@ release_linux_i686_release_nosign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -1096,6 +1362,20 @@ release_linux_i686_release_sign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_linux_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_linux_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_linux_i686_cache: folder: git_clones fingerprint_script: @@ -1158,6 +1438,20 @@ release_windows_x86_64_download_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1208,6 +1502,20 @@ release_windows_x86_64_mingw-w64_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1265,6 +1573,20 @@ release_windows_x86_64_mingw-w64_2_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1322,6 +1644,20 @@ release_windows_x86_64_goeasyconfig_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1379,6 +1715,20 @@ release_windows_x86_64_ncdns_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1436,6 +1786,20 @@ release_windows_x86_64_ncp11_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1493,6 +1857,20 @@ release_windows_x86_64_ncprop279_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1550,6 +1928,20 @@ release_windows_x86_64_plain-binaries_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1607,6 +1999,20 @@ release_windows_x86_64_release_nosign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1667,6 +2073,20 @@ release_windows_x86_64_release_sign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_x86_64_cache: folder: git_clones fingerprint_script: @@ -1729,6 +2149,20 @@ release_windows_i686_download_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -1779,6 +2213,20 @@ release_windows_i686_mingw-w64_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -1836,6 +2284,20 @@ release_windows_i686_mingw-w64_2_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -1893,6 +2355,20 @@ release_windows_i686_goeasyconfig_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -1950,6 +2426,20 @@ release_windows_i686_ncdns_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -2007,6 +2497,20 @@ release_windows_i686_ncp11_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -2064,6 +2568,20 @@ release_windows_i686_ncprop279_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -2121,6 +2639,20 @@ release_windows_i686_plain-binaries_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -2178,6 +2710,20 @@ release_windows_i686_release_nosign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -2238,6 +2784,20 @@ release_windows_i686_release_sign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_windows_i686_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_windows_i686_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_windows_i686_cache: folder: git_clones fingerprint_script: @@ -2300,6 +2860,20 @@ release_osx_x86_64_download_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_osx_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_osx_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: @@ -2350,6 +2924,20 @@ release_osx_x86_64_macosx-toolchain_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_osx_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_osx_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: @@ -2407,6 +2995,20 @@ release_osx_x86_64_macosx-toolchain_2_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_osx_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_osx_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: @@ -2464,6 +3066,20 @@ release_osx_x86_64_goeasyconfig_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_osx_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_osx_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: @@ -2521,6 +3137,20 @@ release_osx_x86_64_ncdns_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_osx_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_osx_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: @@ -2578,6 +3208,20 @@ release_osx_x86_64_ncp11_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_osx_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_osx_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: @@ -2635,6 +3279,20 @@ release_osx_x86_64_ncprop279_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_osx_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_osx_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: @@ -2692,6 +3350,20 @@ release_osx_x86_64_plain-binaries_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_osx_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_osx_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: @@ -2749,6 +3421,20 @@ release_osx_x86_64_release_nosign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_osx_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_osx_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: @@ -2809,6 +3495,20 @@ release_osx_x86_64_release_sign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p out_cache1" + out2_release_osx_x86_64_cache: + folder: out_cache2 + fingerprint_script: + - "echo out2_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache2" + out3_release_osx_x86_64_cache: + folder: out_cache3 + fingerprint_script: + - "echo out3_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache3" git_release_osx_x86_64_cache: folder: git_clones fingerprint_script: diff --git a/tools/cirrus_build_project.sh b/tools/cirrus_build_project.sh index 91fc2d0..319c10c 100755 --- a/tools/cirrus_build_project.sh +++ b/tools/cirrus_build_project.sh @@ -38,6 +38,8 @@ echo "Patching rbm..." echo "Restoring caches..." cp -a ./out_cache1/* ./out/ || true +cp -a ./out_cache2/* ./out/ || true +cp -a ./out_cache3/* ./out/ || true echo "Unpacking interrupted cache..." ./tools/cirrus_unpack_interrupted.sh || true @@ -104,8 +106,12 @@ echo "Cleaning containers..." rm -rfv out/container-image echo "Splitting caches..." -rsync -avu --delete ./out/macosx-toolchain ./out_cache1/ || true +rsync -avu --delete ./out/encaya ./out/gocrosssign ./out/gosafetlsa ./out/q ./out_cache1/ || true +rsync -avu --delete ./out/macosx-toolchain ./out_cache2/ || true +rsync -avu --delete ./out/plain-binaries ./out_cache3/ || true +rm -rf ./out/encaya ./out/gocrosssign ./out/gosafetlsa ./out/q || true rm -rf ./out/macosx-toolchain || true +rm -rf ./out/plain-binaries || true 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 69c7a6b..12198c2 100755 --- a/tools/cirrus_gen_yml.sh +++ b/tools/cirrus_gen_yml.sh @@ -24,6 +24,20 @@ print_os_arch () { reupload_on_changes: true populate_script: - \"mkdir -p out_cache1\" + out2_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_cache2 + fingerprint_script: + - \"echo out2_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_cache2\" + out3_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_cache3 + fingerprint_script: + - \"echo out3_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_cache3\" git_${CHANNEL}_${OS}_${ARCH}_cache: folder: git_clones fingerprint_script: @@ -93,6 +107,20 @@ print_os_arch () { reupload_on_changes: true populate_script: - \"mkdir -p out_cache1\" + out2_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_cache2 + fingerprint_script: + - \"echo out2_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_cache2\" + out3_${CHANNEL}_${OS}_${ARCH}_cache: + folder: out_cache3 + fingerprint_script: + - \"echo out3_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p out_cache3\" git_${CHANNEL}_${OS}_${ARCH}_cache: folder: git_clones fingerprint_script: