Disable Windows and Mac builders

NaCl no longer needs to work for Windows or Mac, disable the builders.

Bug: b:303417958
Change-Id: I79f00d4040f73ca409482d405301b06a0f88bb01
Reviewed-on: https://chromium-review.googlesource.com/c/native_client/src/native_client/+/4922915
Commit-Queue: Fabian Sommer <fabiansommer@chromium.org>
Reviewed-by: Derek Schuff <dschuff@chromium.org>
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 3630ef1..8c7488b 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -57,96 +57,6 @@
         }
       }
       builders {
-        name: "nacl/try/nacl-mac_arm_newlib_opt"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-mac_glibc_dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-mac_glibc_opt"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-mac_newlib_dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-mac_newlib_opt"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-mac_newlib_opt_pnacl"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
         name: "nacl/try/nacl-precise32_glibc_opt"
         location_filters {
           gerrit_host_regexp: ".*"
@@ -415,197 +325,6 @@
           path_regexp: "toolchain_build/.+"
         }
       }
-      builders {
-        name: "nacl/try/nacl-toolchain-mac-pnacl-x86_32"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "buildbot/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pynacl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-toolchain-win7-pnacl-x86_64"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "buildbot/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pynacl/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-win32_glibc_opt"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-win32_newlib_opt"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-win64_glibc_opt"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-win64_newlib_dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-win64_newlib_opt"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-win7_64_arm_newlib_opt"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-win7_64_newlib_opt_pnacl"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-win8-64_newlib_dbg"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
-      builders {
-        name: "nacl/try/nacl-win8-64_newlib_opt"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pnacl/.+"
-          exclude: true
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "toolchain_build/.+"
-          exclude: true
-        }
-      }
       retry_config {
         single_quota: 1
         global_quota: 2
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 8ab77d8..f12dcd7 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -888,474 +888,6 @@
         value: 100
       }
     }
-    builders {
-      name: "mac-arm-newlib-opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "mac-glibc-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "mac-glibc-opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "mac-newlib-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "mac-newlib-opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "mac-newlib-opt-pnacl"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win7-64-arm-newlib-opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win7-64-glibc-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win7-64-glibc-opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win7-64-newlib-opt-pnacl"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win8-64-newlib-dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win8-64-newlib-opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "client.nacl",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
   }
 }
 buckets {
@@ -1523,71 +1055,6 @@
         value: 100
       }
     }
-    builders {
-      name: "mac-pnacl-x86_32"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.nacl.toolchain"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "builder_group": "client.nacl.toolchain",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 43200
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-toolchain-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win-pnacl-x86_32"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.nacl.toolchain"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "builder_group": "client.nacl.toolchain",'
-        '  "recipe": "nacl",'
-        '  "slavetype": "BuilderTester"'
-        '}'
-      execution_timeout_secs: 43200
-      build_numbers: YES
-      service_account: "nacl-toolchain-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
   }
 }
 buckets {
@@ -1687,252 +1154,6 @@
       }
     }
     builders {
-      name: "nacl-mac_arm_newlib_opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-mac_glibc_dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-mac_glibc_opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-mac_newlib_dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-mac_newlib_opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-mac_newlib_opt_pnacl"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "nacl-precise32_glibc_opt"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
@@ -2596,436 +1817,5 @@
         value: 100
       }
     }
-    builders {
-      name: "nacl-toolchain-mac-pnacl-x86_32"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-13"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 43200
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-toolchain-win7-pnacl-x86_64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 43200
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-win32_glibc_opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-win32_newlib_opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-win64_glibc_opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-win64_newlib_dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-win64_newlib_opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-win7_64_arm_newlib_opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-win7_64_newlib_opt_pnacl"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-win8-64_newlib_dbg"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "nacl-win8-64_newlib_opt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builder_group": "tryserver.nacl",'
-        '  "recipe": "nacl",'
-        '  "revision": "HEAD",'
-        '  "slavetype": "Trybot"'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "nacl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
   }
 }
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 07f9cfd..131cfb9 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -101,66 +101,6 @@
     short_name: "opt"
   }
   builders {
-    name: "buildbucket/luci.nacl.ci/mac-newlib-dbg"
-    category: "mac|newlib"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/mac-newlib-opt"
-    category: "mac|newlib"
-    short_name: "opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/mac-arm-newlib-opt"
-    category: "mac|newlib"
-    short_name: "arm"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/mac-glibc-dbg"
-    category: "mac|glibc"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/mac-glibc-opt"
-    category: "mac|glibc"
-    short_name: "opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/mac-newlib-opt-pnacl"
-    category: "mac|pnacl"
-    short_name: "opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/win7-64-arm-newlib-opt"
-    category: "win|win7|newlib"
-    short_name: "arm"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/win7-64-glibc-dbg"
-    category: "win|win7|glibc"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/win7-64-glibc-opt"
-    category: "win|win7|glibc"
-    short_name: "opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/win7-64-newlib-opt-pnacl"
-    category: "win|win7|pnacl"
-    short_name: "opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/win8-64-newlib-dbg"
-    category: "win|win10|newlib"
-    short_name: "dbg"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.ci/win8-64-newlib-opt"
-    category: "win|win10|newlib"
-    short_name: "opt"
-  }
-  builders {
     name: "buildbucket/luci.nacl.ci/linux_64-newlib-x86_32-pnacl-spec"
     category: "spec|pnacl"
     short_name: "32"
@@ -198,16 +138,6 @@
     short_name: "linux"
   }
   builders {
-    name: "buildbucket/luci.nacl.toolchain/mac-pnacl-x86_32"
-    category: "pnacl.release"
-    short_name: "mac"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.toolchain/win-pnacl-x86_32"
-    category: "pnacl.release"
-    short_name: "win"
-  }
-  builders {
     name: "buildbucket/luci.nacl.toolchain/linux-pnacl-x86_64-tests-x86_32"
     category: "pnacl.fyi"
     short_name: "x86-32"
@@ -238,24 +168,6 @@
     name: "buildbucket/luci.nacl.try/nacl-arm_perf"
   }
   builders {
-    name: "buildbucket/luci.nacl.try/nacl-mac_arm_newlib_opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-mac_glibc_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-mac_glibc_opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-mac_newlib_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-mac_newlib_opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-mac_newlib_opt_pnacl"
-  }
-  builders {
     name: "buildbucket/luci.nacl.try/nacl-precise32_glibc_opt"
   }
   builders {
@@ -306,39 +218,6 @@
   builders {
     name: "buildbucket/luci.nacl.try/nacl-toolchain-linux-pnacl-x86_64"
   }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-toolchain-mac-pnacl-x86_32"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-toolchain-win7-pnacl-x86_64"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-win32_glibc_opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-win32_newlib_opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-win64_glibc_opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-win64_newlib_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-win64_newlib_opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-win7_64_arm_newlib_opt"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-win7_64_newlib_opt_pnacl"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-win8-64_newlib_dbg"
-  }
-  builders {
-    name: "buildbucket/luci.nacl.try/nacl-win8-64_newlib_opt"
-  }
   builder_view_only: true
 }
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/nacl-logo.png"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 31579fc..52ddb38 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -284,146 +284,6 @@
     builder: "linux_64-newlib-x86_64-spec"
   }
 }
-job {
-  id: "mac-arm-newlib-opt"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac-arm-newlib-opt"
-  }
-}
-job {
-  id: "mac-glibc-dbg"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac-glibc-dbg"
-  }
-}
-job {
-  id: "mac-glibc-opt"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac-glibc-opt"
-  }
-}
-job {
-  id: "mac-newlib-dbg"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac-newlib-dbg"
-  }
-}
-job {
-  id: "mac-newlib-opt"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac-newlib-opt"
-  }
-}
-job {
-  id: "mac-newlib-opt-pnacl"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "mac-newlib-opt-pnacl"
-  }
-}
-job {
-  id: "mac-pnacl-x86_32"
-  realm: "toolchain"
-  acl_sets: "toolchain"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "toolchain"
-    builder: "mac-pnacl-x86_32"
-  }
-}
-job {
-  id: "win-pnacl-x86_32"
-  realm: "toolchain"
-  acl_sets: "toolchain"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "toolchain"
-    builder: "win-pnacl-x86_32"
-  }
-}
-job {
-  id: "win7-64-arm-newlib-opt"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "win7-64-arm-newlib-opt"
-  }
-}
-job {
-  id: "win7-64-glibc-dbg"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "win7-64-glibc-dbg"
-  }
-}
-job {
-  id: "win7-64-glibc-opt"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "win7-64-glibc-opt"
-  }
-}
-job {
-  id: "win7-64-newlib-opt-pnacl"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "win7-64-newlib-opt-pnacl"
-  }
-}
-job {
-  id: "win8-64-newlib-dbg"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "win8-64-newlib-dbg"
-  }
-}
-job {
-  id: "win8-64-newlib-opt"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "win8-64-newlib-opt"
-  }
-}
 trigger {
   id: "ci-master-gitiles-trigger"
   realm: "ci"
@@ -451,18 +311,6 @@
   triggers: "linux_64-newlib-x86_64-pnacl"
   triggers: "linux_64-newlib-x86_64-pnacl-spec"
   triggers: "linux_64-newlib-x86_64-spec"
-  triggers: "mac-arm-newlib-opt"
-  triggers: "mac-glibc-dbg"
-  triggers: "mac-glibc-opt"
-  triggers: "mac-newlib-dbg"
-  triggers: "mac-newlib-opt"
-  triggers: "mac-newlib-opt-pnacl"
-  triggers: "win7-64-arm-newlib-opt"
-  triggers: "win7-64-glibc-dbg"
-  triggers: "win7-64-glibc-opt"
-  triggers: "win7-64-newlib-opt-pnacl"
-  triggers: "win8-64-newlib-dbg"
-  triggers: "win8-64-newlib-opt"
   gitiles {
     repo: "https://chromium.googlesource.com/native_client/src/native_client"
     refs: "regexp:refs/heads/main"
@@ -477,8 +325,6 @@
   triggers: "linux-pnacl-x86_64-tests-arm"
   triggers: "linux-pnacl-x86_64-tests-x86_32"
   triggers: "linux-pnacl-x86_64-tests-x86_64"
-  triggers: "mac-pnacl-x86_32"
-  triggers: "win-pnacl-x86_32"
   gitiles {
     repo: "https://chromium.googlesource.com/native_client/src/native_client"
     refs: "regexp:refs/heads/main"
diff --git a/generated/project.cfg b/generated/project.cfg
index ec63740..32edce4 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "nacl"
 access: "group:all"
 lucicfg {
-  version: "1.39.8"
+  version: "1.39.20"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/main.star b/main.star
index d4c4a01..88dfdcf 100755
--- a/main.star
+++ b/main.star
@@ -182,13 +182,6 @@
     }
     if "linux" in dimension_mixins:
         dimensions["os"] = "Ubuntu-18.04"
-    elif "mac" in dimension_mixins:
-        dimensions.pop("cores", None)  # Macs can be 4 or 8 cores
-        dimensions["os"] = "Mac-13"
-        caches = [swarming.cache(path = "osx_sdk", name = "osx_sdk")]
-        properties["$build/goma"].pop("enable_ats", None)
-    elif "win" in dimension_mixins:
-        dimensions["os"] = "Windows-10"
 
     if bucket == "toolchain":
         dimensions.pop("cores", None)
@@ -420,78 +413,6 @@
     dimension_mixins = ["linux"],
 )
 ci_builder(
-    name = "mac-newlib-dbg",
-    short_name = "dbg",
-    category = "mac|newlib",
-    dimension_mixins = ["mac"],
-)
-ci_builder(
-    name = "mac-newlib-opt",
-    short_name = "opt",
-    category = "mac|newlib",
-    dimension_mixins = ["mac"],
-)
-ci_builder(
-    name = "mac-arm-newlib-opt",
-    short_name = "arm",
-    category = "mac|newlib",
-    dimension_mixins = ["mac"],
-)
-ci_builder(
-    name = "mac-glibc-dbg",
-    short_name = "dbg",
-    category = "mac|glibc",
-    dimension_mixins = ["mac"],
-)
-ci_builder(
-    name = "mac-glibc-opt",
-    short_name = "opt",
-    category = "mac|glibc",
-    dimension_mixins = ["mac"],
-)
-ci_builder(
-    name = "mac-newlib-opt-pnacl",
-    short_name = "opt",
-    category = "mac|pnacl",
-    dimension_mixins = ["mac"],
-)
-ci_builder(
-    name = "win7-64-arm-newlib-opt",
-    short_name = "arm",
-    category = "win|win7|newlib",
-    dimension_mixins = ["win"],
-)
-ci_builder(
-    name = "win7-64-glibc-dbg",
-    short_name = "dbg",
-    category = "win|win7|glibc",
-    dimension_mixins = ["win"],
-)
-ci_builder(
-    name = "win7-64-glibc-opt",
-    short_name = "opt",
-    category = "win|win7|glibc",
-    dimension_mixins = ["win"],
-)
-ci_builder(
-    name = "win7-64-newlib-opt-pnacl",
-    short_name = "opt",
-    category = "win|win7|pnacl",
-    dimension_mixins = ["win"],
-)
-ci_builder(
-    name = "win8-64-newlib-dbg",
-    short_name = "dbg",
-    category = "win|win10|newlib",
-    dimension_mixins = ["win"],
-)
-ci_builder(
-    name = "win8-64-newlib-opt",
-    short_name = "opt",
-    category = "win|win10|newlib",
-    dimension_mixins = ["win"],
-)
-ci_builder(
     name = "linux_64-newlib-x86_32-pnacl-spec",
     short_name = "32",
     category = "spec|pnacl",
@@ -529,18 +450,6 @@
     dimension_mixins = ["linux", "slow"],
 )
 toolchain_builder(
-    name = "mac-pnacl-x86_32",
-    short_name = "mac",
-    category = "pnacl.release",
-    dimension_mixins = ["mac", "slow"],
-)
-toolchain_builder(
-    name = "win-pnacl-x86_32",
-    short_name = "win",
-    category = "pnacl.release",
-    dimension_mixins = ["win", "slow"],
-)
-toolchain_builder(
     name = "linux-pnacl-x86_64-tests-x86_32",
     short_name = "x86-32",
     category = "pnacl.fyi",
@@ -574,30 +483,6 @@
     dimension_mixins = ["linux"],
 )
 try_builder(
-    name = "nacl-mac_arm_newlib_opt",
-    dimension_mixins = ["mac"],
-)
-try_builder(
-    name = "nacl-mac_glibc_dbg",
-    dimension_mixins = ["mac"],
-)
-try_builder(
-    name = "nacl-mac_glibc_opt",
-    dimension_mixins = ["mac"],
-)
-try_builder(
-    name = "nacl-mac_newlib_dbg",
-    dimension_mixins = ["mac"],
-)
-try_builder(
-    name = "nacl-mac_newlib_opt",
-    dimension_mixins = ["mac"],
-)
-try_builder(
-    name = "nacl-mac_newlib_opt_pnacl",
-    dimension_mixins = ["mac"],
-)
-try_builder(
     name = "nacl-precise32_glibc_opt",
     dimension_mixins = ["linux"],
 )
@@ -668,49 +553,3 @@
     dimension_mixins = ["linux", "slow"],
     cq_type = "toolchain",
 )
-try_builder(
-    name = "nacl-toolchain-mac-pnacl-x86_32",
-    dimension_mixins = ["mac", "slow"],
-    cq_type = "toolchain",
-)
-try_builder(
-    name = "nacl-toolchain-win7-pnacl-x86_64",
-    dimension_mixins = ["win", "slow"],
-    cq_type = "toolchain",
-)
-try_builder(
-    name = "nacl-win32_glibc_opt",
-    dimension_mixins = ["win"],
-)
-try_builder(
-    name = "nacl-win32_newlib_opt",
-    dimension_mixins = ["win"],
-)
-try_builder(
-    name = "nacl-win64_glibc_opt",
-    dimension_mixins = ["win"],
-)
-try_builder(
-    name = "nacl-win64_newlib_dbg",
-    dimension_mixins = ["win"],
-)
-try_builder(
-    name = "nacl-win64_newlib_opt",
-    dimension_mixins = ["win"],
-)
-try_builder(
-    name = "nacl-win7_64_arm_newlib_opt",
-    dimension_mixins = ["win"],
-)
-try_builder(
-    name = "nacl-win7_64_newlib_opt_pnacl",
-    dimension_mixins = ["win"],
-)
-try_builder(
-    name = "nacl-win8-64_newlib_dbg",
-    dimension_mixins = ["win"],
-)
-try_builder(
-    name = "nacl-win8-64_newlib_opt",
-    dimension_mixins = ["win"],
-)