Merge #113: Cirrus: Segregate plain-binaries cache

9559d1b Cirrus: Segregate encaya+gocrosssign+gosafetlsa+q cache (Jeremy Rand)
a732442 Cirrus: Segregate plain-binaries cache (Jeremy Rand)

Pull request description:

  Should improve the odds of the output caches being unmodified, which will save us some upload time.

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

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: