From 938f2ae9269f6f51913aca605fb9ea62f4b79bc5 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Tue, 6 Apr 2021 11:32:37 +0000 Subject: [PATCH] Cirrus: Segregate Git indexes from other Git data Fixes https://github.com/namecoin/ncdns-repro/issues/100 --- .cirrus.yml | 350 ++++++++++++++++++++++++++++++++++ tools/cirrus_build_project.sh | 6 + tools/cirrus_gen_yml.sh | 14 ++ tools/cirrus_pack_git.sh | 10 + tools/cirrus_unpack_git.sh | 10 + 5 files changed, 390 insertions(+) create mode 100755 tools/cirrus_pack_git.sh create mode 100755 tools/cirrus_unpack_git.sh diff --git a/.cirrus.yml b/.cirrus.yml index 34e28ec..8972c60 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,6 +23,13 @@ release_linux_x86_64_download_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -66,6 +73,13 @@ release_linux_x86_64_gcc_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -116,6 +130,13 @@ release_linux_x86_64_gcc_2_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -166,6 +187,13 @@ release_linux_x86_64_goeasyconfig_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -216,6 +244,13 @@ release_linux_x86_64_ncdns_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -266,6 +301,13 @@ release_linux_x86_64_ncp11_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -316,6 +358,13 @@ release_linux_x86_64_ncprop279_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -366,6 +415,13 @@ release_linux_x86_64_plain-binaries_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -416,6 +472,13 @@ release_linux_x86_64_release_nosign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -469,6 +532,13 @@ release_linux_x86_64_release_sign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -524,6 +594,13 @@ release_linux_i686_download_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -567,6 +644,13 @@ release_linux_i686_gcc_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -617,6 +701,13 @@ release_linux_i686_gcc_2_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -667,6 +758,13 @@ release_linux_i686_goeasyconfig_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -717,6 +815,13 @@ release_linux_i686_ncdns_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -767,6 +872,13 @@ release_linux_i686_ncp11_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -817,6 +929,13 @@ release_linux_i686_ncprop279_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -867,6 +986,13 @@ release_linux_i686_plain-binaries_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -917,6 +1043,13 @@ release_linux_i686_release_nosign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -970,6 +1103,13 @@ release_linux_i686_release_sign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_linux_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_linux_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1025,6 +1165,13 @@ release_windows_x86_64_download_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1068,6 +1215,13 @@ release_windows_x86_64_mingw-w64_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1118,6 +1272,13 @@ release_windows_x86_64_mingw-w64_2_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1168,6 +1329,13 @@ release_windows_x86_64_goeasyconfig_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1218,6 +1386,13 @@ release_windows_x86_64_ncdns_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1268,6 +1443,13 @@ release_windows_x86_64_ncp11_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1318,6 +1500,13 @@ release_windows_x86_64_ncprop279_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1368,6 +1557,13 @@ release_windows_x86_64_plain-binaries_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1418,6 +1614,13 @@ release_windows_x86_64_release_nosign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1471,6 +1674,13 @@ release_windows_x86_64_release_sign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1526,6 +1736,13 @@ release_windows_i686_download_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1569,6 +1786,13 @@ release_windows_i686_mingw-w64_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1619,6 +1843,13 @@ release_windows_i686_mingw-w64_2_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1669,6 +1900,13 @@ release_windows_i686_goeasyconfig_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1719,6 +1957,13 @@ release_windows_i686_ncdns_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1769,6 +2014,13 @@ release_windows_i686_ncp11_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1819,6 +2071,13 @@ release_windows_i686_ncprop279_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1869,6 +2128,13 @@ release_windows_i686_plain-binaries_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1919,6 +2185,13 @@ release_windows_i686_release_nosign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -1972,6 +2245,13 @@ release_windows_i686_release_sign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_windows_i686_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_windows_i686_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -2027,6 +2307,13 @@ release_osx_x86_64_download_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_osx_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_osx_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -2070,6 +2357,13 @@ release_osx_x86_64_macosx-toolchain_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_osx_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_osx_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -2120,6 +2414,13 @@ release_osx_x86_64_macosx-toolchain_2_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_osx_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_osx_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -2170,6 +2471,13 @@ release_osx_x86_64_goeasyconfig_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_osx_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_osx_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -2220,6 +2528,13 @@ release_osx_x86_64_ncdns_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_osx_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_osx_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -2270,6 +2585,13 @@ release_osx_x86_64_ncp11_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_osx_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_osx_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -2320,6 +2642,13 @@ release_osx_x86_64_ncprop279_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_osx_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_osx_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -2370,6 +2699,13 @@ release_osx_x86_64_plain-binaries_1_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_osx_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_osx_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -2420,6 +2756,13 @@ release_osx_x86_64_release_nosign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_osx_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_osx_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -2473,6 +2816,13 @@ release_osx_x86_64_release_sign_docker_builder: reupload_on_changes: true populate_script: - "mkdir -p git_clones" + gitindex_release_osx_x86_64_cache: + folder: git_index + fingerprint_script: + - "echo gitindex_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_index" interrupted_aa_release_osx_x86_64_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: diff --git a/tools/cirrus_build_project.sh b/tools/cirrus_build_project.sh index 30d63e2..91fc2d0 100755 --- a/tools/cirrus_build_project.sh +++ b/tools/cirrus_build_project.sh @@ -42,6 +42,9 @@ cp -a ./out_cache1/* ./out/ || true echo "Unpacking interrupted cache..." ./tools/cirrus_unpack_interrupted.sh || true +echo "Unpacking git cache..." +./tools/cirrus_unpack_git.sh || true + if [[ "$PROJECT" == "release" ]]; then echo "release project is never cached." else @@ -104,5 +107,8 @@ echo "Splitting caches..." rsync -avu --delete ./out/macosx-toolchain ./out_cache1/ || true rm -rf ./out/macosx-toolchain || true +echo "Packing git cache..." +./tools/cirrus_pack_git.sh || true + echo "Packing interrupted cache..." ./tools/cirrus_pack_interrupted.sh || true diff --git a/tools/cirrus_gen_yml.sh b/tools/cirrus_gen_yml.sh index 810b03e..69c7a6b 100755 --- a/tools/cirrus_gen_yml.sh +++ b/tools/cirrus_gen_yml.sh @@ -31,6 +31,13 @@ print_os_arch () { reupload_on_changes: true populate_script: - \"mkdir -p git_clones\" + gitindex_${CHANNEL}_${OS}_${ARCH}_cache: + folder: git_index + fingerprint_script: + - \"echo gitindex_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p git_index\" interrupted_aa_${CHANNEL}_${OS}_${ARCH}_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: @@ -93,6 +100,13 @@ print_os_arch () { reupload_on_changes: true populate_script: - \"mkdir -p git_clones\" + gitindex_${CHANNEL}_${OS}_${ARCH}_cache: + folder: git_index + fingerprint_script: + - \"echo gitindex_${CHANNEL}_${OS}_${ARCH}\" + reupload_on_changes: true + populate_script: + - \"mkdir -p git_index\" interrupted_aa_${CHANNEL}_${OS}_${ARCH}_cache: folder: tmp/interrupted_dirs.tar.gz.partaa.folder fingerprint_script: diff --git a/tools/cirrus_pack_git.sh b/tools/cirrus_pack_git.sh new file mode 100755 index 0000000..7de8011 --- /dev/null +++ b/tools/cirrus_pack_git.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -euxo pipefail +shopt -s failglob + +for PROJECT in ./git_clones/* +do + PROJECT_BASE=$(basename $PROJECT) + mv ${PROJECT}/.git/index ./git_index/${PROJECT_BASE} +done diff --git a/tools/cirrus_unpack_git.sh b/tools/cirrus_unpack_git.sh new file mode 100755 index 0000000..bb57e75 --- /dev/null +++ b/tools/cirrus_unpack_git.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -euxo pipefail +shopt -s failglob + +for PROJECT in ./git_index/* +do + PROJECT_BASE=$(basename $PROJECT) + mv ${PROJECT} ./git_clones/${PROJECT_BASE}/.git/index +done