diff --git a/.cirrus.yml b/.cirrus.yml
index 91fbb7a..0426d56 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -72,6 +72,87 @@ release_linux_x86_64_download_task:
     BUMP_DEPS: 0
     RBM_NUM_PROCS: 1
 
+release_linux_x86_64_clang_para1_task:
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/docker-builder
+    platform: linux
+    cpu: 8
+    memory: 16G
+  timeout_in: 120m
+  out_release_linux_x86_64_cache:
+    folder: out
+    fingerprint_script:
+      - "echo out_release_linux_x86_64"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p out"
+  out1_release_linux_x86_64_cache:
+    folder: out_cache1
+    fingerprint_script:
+      - "echo out1_release_linux_x86_64"
+    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:
+      - "echo git_release_linux_x86_64"
+    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:
+      - "echo interrupted_aa_release_linux_x86_64"
+    reupload_on_changes: true
+  interrupted_ab_release_linux_x86_64_cache:
+    folder: tmp/interrupted_dirs.tar.gz.partab.folder
+    fingerprint_script:
+      - "echo interrupted_ab_release_linux_x86_64"
+    reupload_on_changes: true
+  interrupted_ac_release_linux_x86_64_cache:
+    folder: tmp/interrupted_dirs.tar.gz.partac.folder
+    fingerprint_script:
+      - "echo interrupted_ac_release_linux_x86_64"
+    reupload_on_changes: true
+  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
+    - ./tools/container-interrupt.sh
+  build_script:
+    - "./tools/cirrus_build_project.sh clang release linux x86_64 1"
+  env:
+    SIGN_BUILD: 0
+  env:
+    CIRRUS_LOG_TIMESTAMP: true
+    BUMP_DEPS: 0
+    RBM_NUM_PROCS: 8
+  depends_on:
+    - "release_linux_x86_64_download"
+
 release_linux_x86_64_gcc_para1_task:
   compute_engine_instance:
     image_project: cirrus-images
@@ -151,7 +232,7 @@ release_linux_x86_64_gcc_para1_task:
     BUMP_DEPS: 0
     RBM_NUM_PROCS: 8
   depends_on:
-    - "release_linux_x86_64_download"
+    - "release_linux_x86_64_clang_para1"
 
 release_linux_x86_64_goeasyconfig_1_task:
   compute_engine_instance:
@@ -719,6 +800,87 @@ release_linux_i686_download_task:
     BUMP_DEPS: 0
     RBM_NUM_PROCS: 1
 
+release_linux_i686_clang_para1_task:
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/docker-builder
+    platform: linux
+    cpu: 8
+    memory: 16G
+  timeout_in: 120m
+  out_release_linux_i686_cache:
+    folder: out
+    fingerprint_script:
+      - "echo out_release_linux_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p out"
+  out1_release_linux_i686_cache:
+    folder: out_cache1
+    fingerprint_script:
+      - "echo out1_release_linux_i686"
+    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:
+      - "echo git_release_linux_i686"
+    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:
+      - "echo interrupted_aa_release_linux_i686"
+    reupload_on_changes: true
+  interrupted_ab_release_linux_i686_cache:
+    folder: tmp/interrupted_dirs.tar.gz.partab.folder
+    fingerprint_script:
+      - "echo interrupted_ab_release_linux_i686"
+    reupload_on_changes: true
+  interrupted_ac_release_linux_i686_cache:
+    folder: tmp/interrupted_dirs.tar.gz.partac.folder
+    fingerprint_script:
+      - "echo interrupted_ac_release_linux_i686"
+    reupload_on_changes: true
+  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
+    - ./tools/container-interrupt.sh
+  build_script:
+    - "./tools/cirrus_build_project.sh clang release linux i686 1"
+  env:
+    SIGN_BUILD: 0
+  env:
+    CIRRUS_LOG_TIMESTAMP: true
+    BUMP_DEPS: 0
+    RBM_NUM_PROCS: 8
+  depends_on:
+    - "release_linux_i686_download"
+
 release_linux_i686_gcc_para1_task:
   compute_engine_instance:
     image_project: cirrus-images
@@ -798,7 +960,7 @@ release_linux_i686_gcc_para1_task:
     BUMP_DEPS: 0
     RBM_NUM_PROCS: 8
   depends_on:
-    - "release_linux_i686_download"
+    - "release_linux_i686_clang_para1"
 
 release_linux_i686_goeasyconfig_1_task:
   compute_engine_instance:
@@ -1366,6 +1528,87 @@ release_windows_x86_64_download_task:
     BUMP_DEPS: 0
     RBM_NUM_PROCS: 1
 
+release_windows_x86_64_clang_para1_task:
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/docker-builder
+    platform: linux
+    cpu: 8
+    memory: 16G
+  timeout_in: 120m
+  out_release_windows_x86_64_cache:
+    folder: out
+    fingerprint_script:
+      - "echo out_release_windows_x86_64"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p out"
+  out1_release_windows_x86_64_cache:
+    folder: out_cache1
+    fingerprint_script:
+      - "echo out1_release_windows_x86_64"
+    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:
+      - "echo git_release_windows_x86_64"
+    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:
+      - "echo interrupted_aa_release_windows_x86_64"
+    reupload_on_changes: true
+  interrupted_ab_release_windows_x86_64_cache:
+    folder: tmp/interrupted_dirs.tar.gz.partab.folder
+    fingerprint_script:
+      - "echo interrupted_ab_release_windows_x86_64"
+    reupload_on_changes: true
+  interrupted_ac_release_windows_x86_64_cache:
+    folder: tmp/interrupted_dirs.tar.gz.partac.folder
+    fingerprint_script:
+      - "echo interrupted_ac_release_windows_x86_64"
+    reupload_on_changes: true
+  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
+    - ./tools/container-interrupt.sh
+  build_script:
+    - "./tools/cirrus_build_project.sh clang release windows x86_64 1"
+  env:
+    SIGN_BUILD: 0
+  env:
+    CIRRUS_LOG_TIMESTAMP: true
+    BUMP_DEPS: 0
+    RBM_NUM_PROCS: 8
+  depends_on:
+    - "release_windows_x86_64_download"
+
 release_windows_x86_64_mingw-w64_para1_task:
   compute_engine_instance:
     image_project: cirrus-images
@@ -1445,7 +1688,7 @@ release_windows_x86_64_mingw-w64_para1_task:
     BUMP_DEPS: 0
     RBM_NUM_PROCS: 8
   depends_on:
-    - "release_windows_x86_64_download"
+    - "release_windows_x86_64_clang_para1"
 
 release_windows_x86_64_goeasyconfig_1_task:
   compute_engine_instance:
@@ -2013,6 +2256,87 @@ release_windows_i686_download_task:
     BUMP_DEPS: 0
     RBM_NUM_PROCS: 1
 
+release_windows_i686_clang_para1_task:
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/docker-builder
+    platform: linux
+    cpu: 8
+    memory: 16G
+  timeout_in: 120m
+  out_release_windows_i686_cache:
+    folder: out
+    fingerprint_script:
+      - "echo out_release_windows_i686"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p out"
+  out1_release_windows_i686_cache:
+    folder: out_cache1
+    fingerprint_script:
+      - "echo out1_release_windows_i686"
+    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:
+      - "echo git_release_windows_i686"
+    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:
+      - "echo interrupted_aa_release_windows_i686"
+    reupload_on_changes: true
+  interrupted_ab_release_windows_i686_cache:
+    folder: tmp/interrupted_dirs.tar.gz.partab.folder
+    fingerprint_script:
+      - "echo interrupted_ab_release_windows_i686"
+    reupload_on_changes: true
+  interrupted_ac_release_windows_i686_cache:
+    folder: tmp/interrupted_dirs.tar.gz.partac.folder
+    fingerprint_script:
+      - "echo interrupted_ac_release_windows_i686"
+    reupload_on_changes: true
+  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
+    - ./tools/container-interrupt.sh
+  build_script:
+    - "./tools/cirrus_build_project.sh clang release windows i686 1"
+  env:
+    SIGN_BUILD: 0
+  env:
+    CIRRUS_LOG_TIMESTAMP: true
+    BUMP_DEPS: 0
+    RBM_NUM_PROCS: 8
+  depends_on:
+    - "release_windows_i686_download"
+
 release_windows_i686_mingw-w64_para1_task:
   compute_engine_instance:
     image_project: cirrus-images
@@ -2092,7 +2416,7 @@ release_windows_i686_mingw-w64_para1_task:
     BUMP_DEPS: 0
     RBM_NUM_PROCS: 8
   depends_on:
-    - "release_windows_i686_download"
+    - "release_windows_i686_clang_para1"
 
 release_windows_i686_goeasyconfig_1_task:
   compute_engine_instance:
@@ -2660,6 +2984,87 @@ release_osx_x86_64_download_task:
     BUMP_DEPS: 0
     RBM_NUM_PROCS: 1
 
+release_osx_x86_64_clang_para1_task:
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/docker-builder
+    platform: linux
+    cpu: 8
+    memory: 16G
+  timeout_in: 120m
+  out_release_osx_x86_64_cache:
+    folder: out
+    fingerprint_script:
+      - "echo out_release_osx_x86_64"
+    reupload_on_changes: true
+    populate_script:
+      - "mkdir -p out"
+  out1_release_osx_x86_64_cache:
+    folder: out_cache1
+    fingerprint_script:
+      - "echo out1_release_osx_x86_64"
+    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:
+      - "echo git_release_osx_x86_64"
+    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:
+      - "echo interrupted_aa_release_osx_x86_64"
+    reupload_on_changes: true
+  interrupted_ab_release_osx_x86_64_cache:
+    folder: tmp/interrupted_dirs.tar.gz.partab.folder
+    fingerprint_script:
+      - "echo interrupted_ab_release_osx_x86_64"
+    reupload_on_changes: true
+  interrupted_ac_release_osx_x86_64_cache:
+    folder: tmp/interrupted_dirs.tar.gz.partac.folder
+    fingerprint_script:
+      - "echo interrupted_ac_release_osx_x86_64"
+    reupload_on_changes: true
+  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
+    - ./tools/container-interrupt.sh
+  build_script:
+    - "./tools/cirrus_build_project.sh clang release osx x86_64 1"
+  env:
+    SIGN_BUILD: 0
+  env:
+    CIRRUS_LOG_TIMESTAMP: true
+    BUMP_DEPS: 0
+    RBM_NUM_PROCS: 8
+  depends_on:
+    - "release_osx_x86_64_download"
+
 release_osx_x86_64_macosx-toolchain_para1_task:
   compute_engine_instance:
     image_project: cirrus-images
@@ -2739,7 +3144,7 @@ release_osx_x86_64_macosx-toolchain_para1_task:
     BUMP_DEPS: 0
     RBM_NUM_PROCS: 8
   depends_on:
-    - "release_osx_x86_64_download"
+    - "release_osx_x86_64_clang_para1"
 
 release_osx_x86_64_goeasyconfig_1_task:
   compute_engine_instance:
diff --git a/tools/cirrus_gen_yml.sh b/tools/cirrus_gen_yml.sh
index b42f5da..f4da863 100755
--- a/tools/cirrus_gen_yml.sh
+++ b/tools/cirrus_gen_yml.sh
@@ -83,7 +83,7 @@ print_os_arch () {
 
     # TODO fine-tune this list
     # Use "para" prefix to run with 8 threads; otherwise will use 1 thread.
-    for PROJECT in compiler.para1 goeasyconfig.1 ncdns.1 ncprop279.1 plain-binaries.1 release.nosign release.sign; do
+    for PROJECT in clang.para1 compiler.para1 goeasyconfig.1 ncdns.1 ncprop279.1 plain-binaries.1 release.nosign release.sign; do
         PROJECT_BASE=$(echo $PROJECT | cut -d . -f 1)
         if [[ "$PROJECT_BASE" == "compiler" ]]; then
             if [[ "$OS" == "android" ]]; then
@@ -203,7 +203,7 @@ print_os_arch () {
         fi
 
         # Depend on previous project
-        if [[ "$PROJECT" == "compiler.para1" ]]; then
+        if [[ "$PROJECT" == "clang.para1" ]]; then
             echo "  depends_on:
     - \"${CHANNEL}_${OS}_${ARCH}_download\""
         else