[libcxx-commits] [libcxx] 8660b89 - [libc++] Clean up the no-unicode CI job

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-09-09T08:39:30-04:00
New Revision: 8660b89c0c2cccfc5b8ecb70918a3aa8ddcd67bb

URL: https://github.com/llvm/llvm-project/commit/8660b89c0c2cccfc5b8ecb70918a3aa8ddcd67bb
DIFF: https://github.com/llvm/llvm-project/commit/8660b89c0c2cccfc5b8ecb70918a3aa8ddcd67bb.diff

LOG: [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.

Added: 
    

Modified: 
    libcxx/utils/ci/buildkite-pipeline.yml
    libcxx/utils/ci/run-buildbot

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 5d0a5975f424e..39afd7001f8c4 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 ba187b4da2af0..e62562ab56ea0 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