[libcxx-commits] [libcxx] 36418c3 - [libcxx] Stop hardcoding the bash path in the Windows CI

[Martin Storsjö via libcxx-commits]

Author: Martin Storsjö
Date: 2021-04-28T22:02:49+03:00
New Revision: 36418c3d1410e4d4bc9ed011efb329055dc709c2

URL: https://github.com/llvm/llvm-project/commit/36418c3d1410e4d4bc9ed011efb329055dc709c2
DIFF: https://github.com/llvm/llvm-project/commit/36418c3d1410e4d4bc9ed011efb329055dc709c2.diff

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

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 ebcc346ae32bf..1023d7430b145 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 e7b81799bdcd8..0cb7260665d70 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