This is an archive of the discontinued LLVM Phabricator instance.

Differential D101436

[libcxx] Stop hardcoding the bash path in the Windows CI
ClosedPublic

Authored by mstorsjo on Apr 28 2021, 3:31 AM.

Details

Reviewers
curdeius
ldionne
Group Reviewers
Restricted Project
Commits
rG36418c3d1410: [libcxx] Stop hardcoding the bash path in the Windows CI
Summary

The buildbots now have bash available in the path from the start.

Diff Detail

Event Timeline

mstorsjo created this revision.Apr 28 2021, 3:31 AM
Herald added a subscriber: arichardson. · View Herald TranscriptApr 28 2021, 3:31 AM
mstorsjo requested review of this revision.Apr 28 2021, 3:31 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 28 2021, 3:31 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B101365: Diff 341128.Apr 28 2021, 6:14 AM
curdeius accepted this revision as: curdeius.Apr 28 2021, 9:17 AM
curdeius added a subscriber: curdeius.

LGTM. Cool!

ldionne accepted this revision.Apr 28 2021, 10:25 AM
ldionne added a subscriber: ldionne.

Thank you!!

This revision is now accepted and ready to land.Apr 28 2021, 10:25 AM
Closed by commit rG36418c3d1410: [libcxx] Stop hardcoding the bash path in the Windows CI (authored by mstorsjo). · Explain WhyApr 28 2021, 12:03 PM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG36418c3d1410: [libcxx] Stop hardcoding the bash path in the Windows CI.

Revision Contents

PathSize
libcxx/
utils/
ci/
4 lines
4 lines

Diff 341128

libcxx/utils/ci/buildkite-pipeline.yml

Show First 20 Lines • Show All 312 Lines • ▼ Show 20 Lines - label: "Runtimes build"
agents: agents:
queue: "libcxx-builders" queue: "libcxx-builders"
retry: retry:
automatic: automatic:
- exit_status: -1 # Agent was lost - exit_status: -1 # Agent was lost
limit: 2 limit: 2
- label: "Windows" - label: "Windows"
# TODO: The CI runner doesn't have bash in the path currently. Once it command: "bash libcxx/utils/ci/run-buildbot generic-win"
# 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"
artifact_paths: artifact_paths:
- "**/test-results.xml" - "**/test-results.xml"
agents: agents:
queue: "windows" queue: "windows"
retry: retry:
automatic: automatic:
- exit_status: -1 # Agent was lost - exit_status: -1 # Agent was lost
limit: 2 limit: 2
▲ Show 20 Lines • Show All 130 Lines • Show Last 20 Lines

libcxx/utils/ci/run-buildbot

Show First 20 Lines • Show All 467 Lines • ▼ Show 20 Lines
;; ;;
armv7-noexceptions) armv7-noexceptions)
clean clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake" generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake"
check-cxx-cxxabi check-cxx-cxxabi
;; ;;
generic-win) generic-win)
clean 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 # TODO: Clang-cl in MSVC configurations don't have access to compiler_rt
# builtins helpers for int128 division. See # builtins helpers for int128 division. See
# https://reviews.llvm.org/D91139#2429595 for a comment about longterm # https://reviews.llvm.org/D91139#2429595 for a comment about longterm
# intent for handling the issue. In the meantime, define # intent for handling the issue. In the meantime, define
# -D_LIBCPP_HAS_NO_INT128 (both when building the library itself and # -D_LIBCPP_HAS_NO_INT128 (both when building the library itself and
# when building tests) to allow enabling filesystem for running tests, # when building tests) to allow enabling filesystem for running tests,
# even if it uses a non-permanent ABI. # even if it uses a non-permanent ABI.
Show All 27 Lines