From 36418c3d1410e4d4bc9ed011efb329055dc709c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Wed, 28 Apr 2021 00:11:46 +0300 Subject: [PATCH] [libcxx] Stop hardcoding the bash path in the Windows CI The buildbots now have bash available in the path from the start. Differential Revision: https://reviews.llvm.org/D101436 --- libcxx/utils/ci/buildkite-pipeline.yml | 4 +--- libcxx/utils/ci/run-buildbot | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml index ebcc346..1023d74 100644 --- a/libcxx/utils/ci/buildkite-pipeline.yml +++ b/libcxx/utils/ci/buildkite-pipeline.yml @@ -318,9 +318,7 @@ steps: limit: 2 - label: "Windows" - # TODO: The CI runner doesn't have bash in the path currently. Once it - # has that, remove the absolute path and just call 'bash' here. - command: "\"\\Program Files\\Git\\usr\\bin\\bash\" libcxx/utils/ci/run-buildbot generic-win" + command: "bash libcxx/utils/ci/run-buildbot generic-win" artifact_paths: - "**/test-results.xml" agents: diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot index e7b8179..0cb7260 100755 --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -475,10 +475,6 @@ armv7-noexceptions) ;; generic-win) clean - # TODO: The CI runner doesn't have bash in the path currently, and it's - # needed for running tests. Once it's available out of the box, remove this. - export PATH="$PATH:/c/Program Files/Git/usr/bin" - # TODO: Clang-cl in MSVC configurations don't have access to compiler_rt # builtins helpers for int128 division. See # https://reviews.llvm.org/D91139#2429595 for a comment about longterm -- 2.7.4