[libcxx-commits] [PATCH] D90068: [libc++] Perform libc++ CI directly in the pipeline instead of triggering our own pipeline

[Louis Dionne via Phabricator via libcxx-commits]

ldionne created this revision.
ldionne added a reviewer: goncharov.
Herald added subscribers: libcxx-commits, jkorous, arichardson.
Herald added a project: libc++.
Herald added a reviewer: libc++.
ldionne requested review of this revision.

Otherwise, the artifacts uploaded in the libc++ jobs are not picked up
by the reporting job, which is in the premerge-checks pipeline.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D90068

Files:
  libcxx/utils/ci/buildkite-pipeline-premerge.sh
  libcxx/utils/ci/buildkite-pipeline-snapshot.sh


Index: libcxx/utils/ci/buildkite-pipeline-snapshot.sh
===================================================================
--- libcxx/utils/ci/buildkite-pipeline-snapshot.sh
+++ libcxx/utils/ci/buildkite-pipeline-snapshot.sh
@@ -14,12 +14,5 @@
 # Invoked by CI on full builds.
 #
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-cat <<EOF
-steps:
-  - trigger: "libcxx-ci"
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      commit: "${BUILDKITE_COMMIT}"
-      branch: "${BUILDKITE_BRANCH}"
-EOF
+THIS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+cat "${THIS_DIR}/buildkite-pipeline.yml"
Index: libcxx/utils/ci/buildkite-pipeline-premerge.sh
===================================================================
--- libcxx/utils/ci/buildkite-pipeline-premerge.sh
+++ libcxx/utils/ci/buildkite-pipeline-premerge.sh
@@ -15,28 +15,10 @@
 # Invoked by CI on pre-merge check for a commit.
 #
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
 if ! git diff --name-only HEAD~1 | grep -q -E "libcxx/|libcxxabi/"; then
-  # libcxx is not affected
+  # libc++ and libc++abi are not affected
   exit 0
 fi
 
-reviewID="$(git log --format=%B -n 1 | sed -nE 's/^Review-ID:[[:space:]]*(.+)$/\1/p')"
-if [[ "${reviewID}" != "" ]]; then
-  buildMessage="https://llvm.org/${reviewID}"
-else
-  buildMessage="Push to branch ${BUILDKITE_BRANCH}"
-fi
-
-
-cat <<EOF
-steps:
-  - trigger: "libcxx-ci"
-    build:
-      message: "${buildMessage}"
-      commit: "${BUILDKITE_COMMIT}"
-      branch: "${BUILDKITE_BRANCH}"
-EOF
-
-
+THIS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+cat "${THIS_DIR}/buildkite-pipeline.yml"


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D90068.300378.patch
Type: text/x-patch
Size: 1708 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20201023/a90c5872/attachment.bin>