[CI] Only run normal check targets if requested #168412
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When building just the runtimes (eg a patch only touches compiler-rt), we do not actually run any normal check targets. This ends up causing an empty ninja invocation, which builds more targets than necessary. Gate the ninja build for normal check-* targets under an if statement to fix this.
Member
|
@llvm/pr-subscribers-infrastructure Author: Aiden Grossman (boomanaiden154) ChangesWhen building just the runtimes (eg a patch only touches compiler-rt), we do not actually run any normal check targets. This ends up causing an empty ninja invocation, which builds more targets than necessary. Gate the ninja build for normal check-* targets under an if statement to fix this. Full diff: https://github.com/llvm/llvm-project/pull/168412.diff 2 Files Affected:
diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh
index 4a8418d7baa8c..ca619aa7e98a1 100755
--- a/.ci/monolithic-linux.sh
+++ b/.ci/monolithic-linux.sh
@@ -64,9 +64,11 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
start-group "ninja"
-# Targets are not escaped as they are passed as separate arguments.
-ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log
-cp ${BUILD_DIR}/.ninja_log ninja.ninja_log
+if [[ "${targets}" != "" ]]; then
+ # Targets are not escaped as they are passed as separate arguments.
+ ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log
+ cp ${BUILD_DIR}/.ninja_log ninja.ninja_log
+fi
if [[ "${runtime_targets}" != "" ]]; then
start-group "ninja Runtimes"
diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index 7b926b87f3623..99e7758ce8d79 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -51,9 +51,11 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
start-group "ninja"
-# Targets are not escaped as they are passed as separate arguments.
-ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log
-cp ${BUILD_DIR}/.ninja_log ninja.ninja_log
+if [[ "${targets}" != "" ]]; then
+ # Targets are not escaped as they are passed as separate arguments.
+ ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log
+ cp ${BUILD_DIR}/.ninja_log ninja.ninja_log
+fi
if [[ "${runtimes_targets}" != "" ]]; then
start-group "ninja runtimes"
|
🐧 Linux x64 Test Results
|
cmtice
reviewed
Nov 17, 2025
| # Targets are not escaped as they are passed as separate arguments. | ||
| ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log | ||
| cp ${BUILD_DIR}/.ninja_log ninja.ninja_log | ||
| if [[ "${targets}" != "" ]]; then |
Contributor
There was a problem hiding this comment.
Suggestion: use "-z" instead, i.e.
if [[ -z "${targets} ]] ; then
Contributor
Author
There was a problem hiding this comment.
This is stylistically consistent with the rest of the premerge bash scripts. If we prefer -z, we should probably switch over all at once in a follow up/base patch.
Contributor
There was a problem hiding this comment.
Ok. I think we should switch to '-z' everywhere, but I'm ok with doing that in another PR.
cmtice
reviewed
Nov 17, 2025
| # Targets are not escaped as they are passed as separate arguments. | ||
| ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log | ||
| cp ${BUILD_DIR}/.ninja_log ninja.ninja_log | ||
| if [[ "${targets}" != "" ]]; then |
cmtice
approved these changes
Nov 18, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When building just the runtimes (eg a patch only touches compiler-rt), we do not actually run any normal check targets. This ends up causing an empty ninja invocation, which builds more targets than necessary. Gate the ninja build for normal check-* targets under an if statement to fix this.