[PATCH] D138042: [libc++] Trigger both Clang and libc++ CI when there are changes to both

[Louis Dionne via Phabricator via cfe-commits]

ldionne created this revision.
ldionne added a reviewer: Mordante.
Herald added a subscriber: arichardson.
Herald added a project: All.
ldionne requested review of this revision.
Herald added projects: clang, libc++.
Herald added subscribers: libcxx-commits, cfe-commits.
Herald added a reviewer: libc++.

Per post-commit comments in https://reviews.llvm.org/D137759.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D138042

Files:
  clang/foo
  libcxx/foo
  libcxx/utils/ci/buildkite-pipeline-clang.yml
  libcxx/utils/ci/generate-buildkite-pipeline


Index: libcxx/utils/ci/generate-buildkite-pipeline
===================================================================
--- libcxx/utils/ci/generate-buildkite-pipeline
+++ libcxx/utils/ci/generate-buildkite-pipeline
@@ -12,15 +12,9 @@
 #
 
 if git diff --name-only HEAD~1 | grep -q -E 
"^libcxx/|^libcxxabi/|^libunwind/|^runtimes/|^cmake/"; then
-  LIBCXX_CHANGED=true
+  cat libcxx/utils/ci/buildkite-pipeline.yml
 fi
 
 if git diff --name-only HEAD~1 | grep -q -E "^clang/"; then
-  CLANG_CHANGED=true
-fi
-
-if [[ "${CLANG_CHANGED}" == "true" && "${LIBCXX_CHANGED}" != "true" ]]; then
   cat libcxx/utils/ci/buildkite-pipeline-clang.yml
-else
-  cat libcxx/utils/ci/buildkite-pipeline.yml
 fi
Index: libcxx/utils/ci/buildkite-pipeline-clang.yml
===================================================================
--- libcxx/utils/ci/buildkite-pipeline-clang.yml
+++ libcxx/utils/ci/buildkite-pipeline-clang.yml
@@ -80,7 +80,7 @@
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "Modules"
+  - label: "Clang Modules"
     commands:
       - "buildkite-agent artifact download 'install/**' ."
       - "export CC=$(pwd)/install/bin/clang"



Index: libcxx/utils/ci/generate-buildkite-pipeline
===================================================================
--- libcxx/utils/ci/generate-buildkite-pipeline
+++ libcxx/utils/ci/generate-buildkite-pipeline
@@ -12,15 +12,9 @@
 #
 
 if git diff --name-only HEAD~1 | grep -q -E "^libcxx/|^libcxxabi/|^libunwind/|^runtimes/|^cmake/"; then
-  LIBCXX_CHANGED=true
+  cat libcxx/utils/ci/buildkite-pipeline.yml
 fi
 
 if git diff --name-only HEAD~1 | grep -q -E "^clang/"; then
-  CLANG_CHANGED=true
-fi
-
-if [[ "${CLANG_CHANGED}" == "true" && "${LIBCXX_CHANGED}" != "true" ]]; then
   cat libcxx/utils/ci/buildkite-pipeline-clang.yml
-else
-  cat libcxx/utils/ci/buildkite-pipeline.yml
 fi
Index: libcxx/utils/ci/buildkite-pipeline-clang.yml
===================================================================
--- libcxx/utils/ci/buildkite-pipeline-clang.yml
+++ libcxx/utils/ci/buildkite-pipeline-clang.yml
@@ -80,7 +80,7 @@
           limit: 2
     timeout_in_minutes: 120
 
-  - label: "Modules"
+  - label: "Clang Modules"
     commands:
       - "buildkite-agent artifact download 'install/**' ."
       - "export CC=$(pwd)/install/bin/clang"

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits