From 8660b89c0c2cccfc5b8ecb70918a3aa8ddcd67bb Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Thu, 9 Sep 2021 08:38:09 -0400 Subject: [PATCH] [libc++] Clean up the no-unicode CI job It was added after we changed the way the CI jobs are run, in particular how they are pinned down to Linux instances only. As a result, the job would sometimes run on Mac machines, which we're trying to keep only for jobs that absolutely need it due to capacity concerns. --- libcxx/utils/ci/buildkite-pipeline.yml | 2 ++ libcxx/utils/ci/run-buildbot | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml index 5d0a5975f424..39afd7001f8c 100644 --- a/libcxx/utils/ci/buildkite-pipeline.yml +++ b/libcxx/utils/ci/buildkite-pipeline.yml @@ -388,10 +388,12 @@ steps: - "**/test-results.xml" agents: queue: "libcxx-builders" + os: "linux" retry: automatic: - exit_status: -1 # Agent was lost limit: 2 + timeout_in_minutes: 120 - label: "Benchmarks" command: "libcxx/utils/ci/run-buildbot benchmarks" diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot index ba187b4da2af..e62562ab56ea 100755 --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -340,8 +340,6 @@ generic-no-localization) check-cxx-cxxabi ;; generic-no-unicode) - export CC=clang - export CXX=clang++ clean generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-unicode.cmake" check-cxx-cxxabi