Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Never cancel branch builds for main and release branches #11750

Merged
merged 1 commit into from
Mar 20, 2021

Conversation

Eric-Arellano
Copy link
Contributor

Fixes up #11747 so that we always build for main and release branches, even if a newer commit lands during a CI run.

Comment on lines 20 to +25
NUM_RUST_FILES=$(echo "${CHANGED_FILES})" | grep -c -E \
-e "^src/rust/engine" \
-e "^rust-toolchain" \
-e "^build-support/bin/rust" \
-e "^build-support/bin/generate_travis_yml.py")
-e "^build-support/bin/generate_travis_yml.py" \
-e "^build-support/bin/generate_github_workflows.py")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to replace this with GitHub Action's first-class support for this, but in the meantime..

Comment on lines -45 to -51
if [[ "${HAS_CI_SKIP}" -eq 1 ]] && [ "${NUM_NON_MD_FILES}" -eq 0 ]; then
cat <<EOF >> "${COMMIT_MSG_FILEPATH}"

# All CI will be skipped. Delete if not intended.
[ci skip]
EOF
fi
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unconsumed in GitHub config. Also we rarely update .md files anymore, so not really relevant.

@Eric-Arellano Eric-Arellano merged commit 69bc1a2 into pantsbuild:main Mar 20, 2021
@Eric-Arellano Eric-Arellano deleted the dont-cancel-branch branch March 20, 2021 00:44
@benjyw benjyw mentioned this pull request Mar 20, 2021
jsirois added a commit to jsirois/pants that referenced this pull request Mar 21, 2021
Shellcheck was complaining:
```
In ./build-support/githooks/prepare-commit-msg line 39:
HAS_CI_SKIP=$?
^---------^ SC2034: HAS_CI_SKIP appears unused. Verify use (or export if used externally).
```

This appears to be leftovers from pantsbuild#11750.

[ci skip-rust]
[ci skip-build-wheels]
jsirois added a commit that referenced this pull request Mar 21, 2021
Shellcheck was complaining:
```
In ./build-support/githooks/prepare-commit-msg line 39:
HAS_CI_SKIP=$?
^---------^ SC2034: HAS_CI_SKIP appears unused. Verify use (or export if used externally).
```

This appears to be leftovers from #11750.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants