From 1b8e02a9acb301c7b71a666c27b790770a7dac0e Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:48 +0000 Subject: [PATCH 1/8] Bump tor-browser-build --- tor-browser-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-browser-build b/tor-browser-build index 896b7c3..a345f20 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit 896b7c34db546b55bb466e24e87b01a7eec434e4 +Subproject commit a345f20bc3c95e766e62ac67eb47dfe490733282 From 3ffc5b73c3e7174e3e6828b48239cd8b7c8ed069 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Tue, 18 May 2021 00:39:22 +0000 Subject: [PATCH 2/8] Rebase checkpoints.patch for TBB 10.5a15 --- tools/checkpoints.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/checkpoints.patch b/tools/checkpoints.patch index 12caaf9..4450c11 100644 --- a/tools/checkpoints.patch +++ b/tools/checkpoints.patch @@ -1,4 +1,4 @@ -From 25b581c833679939408fa51ce1d43b55ae481d51 Mon Sep 17 00:00:00 2001 +From f1de814df5ff7649268c5684d85f6679ac2be049 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Fri, 19 Feb 2021 00:23:40 +0000 Subject: [PATCH 1/3] clang: Support rbm checkpointing @@ -8,7 +8,7 @@ Subject: [PATCH 1/3] clang: Support rbm checkpointing 1 file changed, 13 insertions(+) diff --git a/projects/clang/build b/projects/clang/build -index c4c16d9..bb8283b 100644 +index 05a93dc..0c78780 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -2,6 +2,13 @@ @@ -25,7 +25,7 @@ index c4c16d9..bb8283b 100644 tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" [% IF c("var/linux") || c("var/android") %] -@@ -35,6 +42,12 @@ cd build +@@ -37,6 +44,12 @@ cd build [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;lld" [% END -%] @@ -42,7 +42,7 @@ index c4c16d9..bb8283b 100644 2.20.1 -From ab0c171fe1c82efed5cbaf657b06d7103f209cb9 Mon Sep 17 00:00:00 2001 +From 68a55e0dc82875550eb78d17683c0eb582c22c23 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Sat, 20 Feb 2021 08:51:15 +0000 Subject: [PATCH 2/3] macosx-toolchain: Support rbm checkpointing @@ -85,7 +85,7 @@ index 5716a9e..94f6df1 100644 2.20.1 -From 18866ae3512d13c1581a5fedad68565b9cc2e592 Mon Sep 17 00:00:00 2001 +From 54af5c1fd0c1bb6268ff6d8e0d2755fc9d96966a Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Mon, 22 Mar 2021 17:19:12 +0000 Subject: [PATCH 3/3] rbm.conf: Support rbm checkpointing @@ -95,10 +95,10 @@ Subject: [PATCH 3/3] rbm.conf: Support rbm checkpointing 1 file changed, 25 insertions(+) diff --git a/rbm.conf b/rbm.conf -index 76ab74b..8014570 100644 +index a7023f2..18d8f78 100644 --- a/rbm.conf +++ b/rbm.conf -@@ -504,6 +504,18 @@ runc: +@@ -509,6 +509,18 @@ container: remote_start: | #!/bin/sh set -e @@ -117,7 +117,7 @@ index 76ab74b..8014570 100644 if [ $(ls -1 '[% c("remote_srcdir", { error_if_undef => 1 }) %]/container-image_'* | wc -l) -ne 1 ] then echo "Can't find container image in input files" >&2 -@@ -580,6 +592,19 @@ runc: +@@ -568,6 +580,19 @@ container: remote_finish: | #!/bin/sh set -e @@ -134,9 +134,9 @@ index 76ab74b..8014570 100644 + exit + fi + - sudo rm -Rf '[% c("var/container/dir", { error_if_undef => 1 }) %]'/rootfs '[% c("var/container/dir", { error_if_undef => 1 }) %]'/config.json - rmdir '[% c("var/container/dir") %]' + [% c("rbmdir") %]/container remove '[% c("var/container/dir") %]' + ENV: -- 2.20.1 From 369dd18863112f9d3320c7c1c08929d0e40004fe Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Tue, 18 May 2021 02:10:31 +0000 Subject: [PATCH 3/8] Cirrus: Update apt dependencies for TBB 10.5a15 --- tools/cirrus_build_project.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cirrus_build_project.sh b/tools/cirrus_build_project.sh index c4bb280..311028b 100755 --- a/tools/cirrus_build_project.sh +++ b/tools/cirrus_build_project.sh @@ -21,7 +21,7 @@ mv .cirrus.yml .cirrus.yml.bak diff .cirrus.yml .cirrus.yml.bak echo "Installing rbm deps..." -APT_DEPS="libyaml-libyaml-perl libtemplate-perl libio-handle-util-perl libio-all-perl libio-captureoutput-perl libjson-perl libpath-tiny-perl libstring-shellquote-perl libsort-versions-perl libdigest-sha-perl libdata-uuid-perl libdata-dump-perl libfile-copy-recursive-perl libfile-slurp-perl git runc rsync" +APT_DEPS="libyaml-libyaml-perl libtemplate-perl libdatetime-perl libio-handle-util-perl libio-all-perl libio-captureoutput-perl libjson-perl libpath-tiny-perl libstring-shellquote-perl libsort-versions-perl libdigest-sha-perl libdata-uuid-perl libdata-dump-perl libfile-copy-recursive-perl libfile-slurp-perl git uidmap rsync" apt-get install -y $APT_DEPS || (sleep 15s && apt-get install -y $APT_DEPS) echo "Pulling rbm..." From 9d2b16b66fd14c984dd19865777a2ed186926662 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Tue, 18 May 2021 02:20:29 +0000 Subject: [PATCH 4/8] Remove debootstrap-image project No longer present in upstream TBB. --- projects/debootstrap-image | 1 - 1 file changed, 1 deletion(-) delete mode 120000 projects/debootstrap-image diff --git a/projects/debootstrap-image b/projects/debootstrap-image deleted file mode 120000 index 58b1d28..0000000 --- a/projects/debootstrap-image +++ /dev/null @@ -1 +0,0 @@ -../tor-browser-build/projects/debootstrap-image/ \ No newline at end of file From b8f37e4c91adb9c348a46446b8a7b7a044d584fc Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Tue, 18 May 2021 02:21:26 +0000 Subject: [PATCH 5/8] Add mmdebstrap-image project Now required due to upstream TBB changes. --- projects/mmdebstrap-image | 1 + 1 file changed, 1 insertion(+) create mode 120000 projects/mmdebstrap-image diff --git a/projects/mmdebstrap-image b/projects/mmdebstrap-image new file mode 120000 index 0000000..4f235de --- /dev/null +++ b/projects/mmdebstrap-image @@ -0,0 +1 @@ +../tor-browser-build/projects/mmdebstrap-image \ No newline at end of file From 6c02b0910ff0aed07a61c4d1b9fbe0dcb47d0b80 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Tue, 18 May 2021 02:27:58 +0000 Subject: [PATCH 6/8] Add mmdebstrap project Now required due to upstream TBB changes. --- projects/mmdebstrap | 1 + 1 file changed, 1 insertion(+) create mode 120000 projects/mmdebstrap diff --git a/projects/mmdebstrap b/projects/mmdebstrap new file mode 120000 index 0000000..914dd7d --- /dev/null +++ b/projects/mmdebstrap @@ -0,0 +1 @@ +../tor-browser-build/projects/mmdebstrap \ No newline at end of file From 8f25d5924919d4768566e1650be5dac7a6ba682f Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 07:26:56 +0000 Subject: [PATCH 7/8] Cirrus: Add root to subuid/subgid list Fixes https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/40298 --- tools/add-root-subids.py | 22 ++++++++++++++++++++++ tools/cirrus_build_project.sh | 3 +++ 2 files changed, 25 insertions(+) create mode 100755 tools/add-root-subids.py diff --git a/tools/add-root-subids.py b/tools/add-root-subids.py new file mode 100755 index 0000000..f55cb09 --- /dev/null +++ b/tools/add-root-subids.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 + +def add_subid(baseid: str, filename: str): + mapid = 100000 + countid = 65536 + + with open(filename, "r") as f: + for line in f: + line_baseid, line_mapid, line_countid = line.split(":") + line_mapid = int(line_mapid) + line_countid = int(line_countid) + + if line_baseid == baseid: + return + + mapid = max(mapid, line_mapid + line_countid) + + with open(filename, "a") as f: + f.write(f"{baseid}:{mapid}:{countid}\n") + +add_subid("root", "/etc/subuid") +add_subid("root", "/etc/subgid") diff --git a/tools/cirrus_build_project.sh b/tools/cirrus_build_project.sh index 311028b..9af02a6 100755 --- a/tools/cirrus_build_project.sh +++ b/tools/cirrus_build_project.sh @@ -36,6 +36,9 @@ cat tools/rbm.local.conf.onetarget | sed "s/CHANNEL/$CHANNEL/g" | sed "s/ncdns-a echo "Patching rbm..." ./tools/patch-tor-to-namecoin.sh +echo "Mapping subid's..." +./tools/add-root-subids.py + if [[ "$BUMP_DEPS" -eq 1 ]]; then ./tools/namecoin-bump-versions.sh exit 0 From 00218b81dba47ddcbf513a210174d3846e525659 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 20:01:25 +0000 Subject: [PATCH 8/8] Decrease checkpoint timeout to 105m Turns out 110m doesn't reliably leave enough time to pack+upload the caches when the interrupt cache is very large (e.g. macosx-toolchain). --- .cirrus.yml | 180 ++++++++++++++++++++++++++++++---------- tools/cirrus_gen_yml.sh | 4 +- 2 files changed, 138 insertions(+), 46 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index c0c2864..5abd14f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -125,7 +125,9 @@ release_linux_x86_64_gcc_1_docker_builder: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh gcc release linux x86_64 1" @@ -197,7 +199,9 @@ release_linux_x86_64_gcc_2_docker_builder: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh gcc release linux x86_64 1" @@ -269,7 +273,9 @@ release_linux_x86_64_goeasyconfig_1_docker_builder: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh goeasyconfig release linux x86_64 1" @@ -341,7 +347,9 @@ release_linux_x86_64_ncdns_1_docker_builder: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncdns release linux x86_64 1" @@ -413,7 +421,9 @@ release_linux_x86_64_ncp11_1_docker_builder: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncp11 release linux x86_64 1" @@ -485,7 +495,9 @@ release_linux_x86_64_ncprop279_1_docker_builder: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncprop279 release linux x86_64 1" @@ -557,7 +569,9 @@ release_linux_x86_64_plain-binaries_1_docker_builder: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh plain-binaries release linux x86_64 1" @@ -629,7 +643,9 @@ release_linux_x86_64_release_nosign_docker_builder: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release linux x86_64 1" @@ -704,7 +720,9 @@ release_linux_x86_64_release_sign_docker_builder: - "echo interrupted_ac_release_linux_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release linux x86_64 1" @@ -846,7 +864,9 @@ release_linux_i686_gcc_1_docker_builder: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh gcc release linux i686 1" @@ -918,7 +938,9 @@ release_linux_i686_gcc_2_docker_builder: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh gcc release linux i686 1" @@ -990,7 +1012,9 @@ release_linux_i686_goeasyconfig_1_docker_builder: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh goeasyconfig release linux i686 1" @@ -1062,7 +1086,9 @@ release_linux_i686_ncdns_1_docker_builder: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncdns release linux i686 1" @@ -1134,7 +1160,9 @@ release_linux_i686_ncp11_1_docker_builder: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncp11 release linux i686 1" @@ -1206,7 +1234,9 @@ release_linux_i686_ncprop279_1_docker_builder: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncprop279 release linux i686 1" @@ -1278,7 +1308,9 @@ release_linux_i686_plain-binaries_1_docker_builder: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh plain-binaries release linux i686 1" @@ -1350,7 +1382,9 @@ release_linux_i686_release_nosign_docker_builder: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release linux i686 1" @@ -1425,7 +1459,9 @@ release_linux_i686_release_sign_docker_builder: - "echo interrupted_ac_release_linux_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release linux i686 1" @@ -1567,7 +1603,9 @@ release_windows_x86_64_mingw-w64_1_docker_builder: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh mingw-w64 release windows x86_64 1" @@ -1639,7 +1677,9 @@ release_windows_x86_64_mingw-w64_2_docker_builder: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh mingw-w64 release windows x86_64 1" @@ -1711,7 +1751,9 @@ release_windows_x86_64_goeasyconfig_1_docker_builder: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh goeasyconfig release windows x86_64 1" @@ -1783,7 +1825,9 @@ release_windows_x86_64_ncdns_1_docker_builder: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncdns release windows x86_64 1" @@ -1855,7 +1899,9 @@ release_windows_x86_64_ncp11_1_docker_builder: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncp11 release windows x86_64 1" @@ -1927,7 +1973,9 @@ release_windows_x86_64_ncprop279_1_docker_builder: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncprop279 release windows x86_64 1" @@ -1999,7 +2047,9 @@ release_windows_x86_64_plain-binaries_1_docker_builder: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh plain-binaries release windows x86_64 1" @@ -2071,7 +2121,9 @@ release_windows_x86_64_release_nosign_docker_builder: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release windows x86_64 1" @@ -2146,7 +2198,9 @@ release_windows_x86_64_release_sign_docker_builder: - "echo interrupted_ac_release_windows_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release windows x86_64 1" @@ -2288,7 +2342,9 @@ release_windows_i686_mingw-w64_1_docker_builder: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh mingw-w64 release windows i686 1" @@ -2360,7 +2416,9 @@ release_windows_i686_mingw-w64_2_docker_builder: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh mingw-w64 release windows i686 1" @@ -2432,7 +2490,9 @@ release_windows_i686_goeasyconfig_1_docker_builder: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh goeasyconfig release windows i686 1" @@ -2504,7 +2564,9 @@ release_windows_i686_ncdns_1_docker_builder: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncdns release windows i686 1" @@ -2576,7 +2638,9 @@ release_windows_i686_ncp11_1_docker_builder: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncp11 release windows i686 1" @@ -2648,7 +2712,9 @@ release_windows_i686_ncprop279_1_docker_builder: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncprop279 release windows i686 1" @@ -2720,7 +2786,9 @@ release_windows_i686_plain-binaries_1_docker_builder: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh plain-binaries release windows i686 1" @@ -2792,7 +2860,9 @@ release_windows_i686_release_nosign_docker_builder: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release windows i686 1" @@ -2867,7 +2937,9 @@ release_windows_i686_release_sign_docker_builder: - "echo interrupted_ac_release_windows_i686" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release windows i686 1" @@ -3009,7 +3081,9 @@ release_osx_x86_64_macosx-toolchain_1_docker_builder: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh macosx-toolchain release osx x86_64 1" @@ -3081,7 +3155,9 @@ release_osx_x86_64_macosx-toolchain_2_docker_builder: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh macosx-toolchain release osx x86_64 1" @@ -3153,7 +3229,9 @@ release_osx_x86_64_goeasyconfig_1_docker_builder: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh goeasyconfig release osx x86_64 1" @@ -3225,7 +3303,9 @@ release_osx_x86_64_ncdns_1_docker_builder: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncdns release osx x86_64 1" @@ -3297,7 +3377,9 @@ release_osx_x86_64_ncp11_1_docker_builder: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncp11 release osx x86_64 1" @@ -3369,7 +3451,9 @@ release_osx_x86_64_ncprop279_1_docker_builder: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncprop279 release osx x86_64 1" @@ -3441,7 +3525,9 @@ release_osx_x86_64_plain-binaries_1_docker_builder: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh plain-binaries release osx x86_64 1" @@ -3513,7 +3599,9 @@ release_osx_x86_64_release_nosign_docker_builder: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release osx x86_64 1" @@ -3588,7 +3676,9 @@ release_osx_x86_64_release_sign_docker_builder: - "echo interrupted_ac_release_osx_x86_64" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release osx x86_64 1" diff --git a/tools/cirrus_gen_yml.sh b/tools/cirrus_gen_yml.sh index 1497746..18413e7 100755 --- a/tools/cirrus_gen_yml.sh +++ b/tools/cirrus_gen_yml.sh @@ -152,7 +152,9 @@ print_os_arch () { - \"echo interrupted_ac_${CHANNEL}_${OS}_${ARCH}\" reupload_on_changes: true checkpoint_background_script: - - sleep 110m + # 110m caused the 2hr task timeout to be hit while the cache was uploading + # for macosx-toolchain, which broke subsequent builds. + - sleep 105m - ./tools/container-interrupt.sh build_script: - \"./tools/cirrus_build_project.sh ${PROJECT_BASE} ${CHANNEL} ${OS} ${ARCH} 1\""