diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2021-07-27 15:09:19 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2021-07-27 17:57:17 -0700 |
| commit | 6104c315564a4be840a9704b0002bdbe004d3e07 (patch) | |
| tree | 2958ceb991549e97ba87ad8ad3912b23adc7e8e4 /share | |
| parent | af468235e2e3d53b5cd47064e1c9e20ca13eebfc (diff) | |
| download | spack-6104c315564a4be840a9704b0002bdbe004d3e07.tar.gz spack-6104c315564a4be840a9704b0002bdbe004d3e07.tar.bz2 spack-6104c315564a4be840a9704b0002bdbe004d3e07.tar.xz spack-6104c315564a4be840a9704b0002bdbe004d3e07.zip | |
bugfix: be careful about GITHUB_BASE_REF in `spack style`
`spack style` previously used a Travis CI variable to figure out
what the base branch of a PR was, and this was apparently also set
on `develop`. We switched to `GITHUB_BASE_REF` to support GitHub
Actions, but it looks like this is set to `""` in pushes to develop,
so `spack style` breaks there.
This PR does two things:
- [x] Remove `GITHUB_BASE_REF` knowledge from `spack style` entirely
- [x] Handle `GITHUB_BASE_REF` in style scripts instead, and explicitly
pass the base ref if it is present, but don't otherwise.
This makes `spack style` *not* dependent on the environment and fixes
handling of the base branch in the right place.
Diffstat (limited to 'share')
| -rwxr-xr-x | share/spack/qa/run-style-tests | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/share/spack/qa/run-style-tests b/share/spack/qa/run-style-tests index 86abeeeac1..72c47ff055 100755 --- a/share/spack/qa/run-style-tests +++ b/share/spack/qa/run-style-tests @@ -16,8 +16,13 @@ # . "$(dirname $0)/setup.sh" +BASE="" +if [ -n "$GITHUB_BASE_REF" ]; then + BASE="--base ${GITHUB_BASE_REF}" +fi + # verify that the code style is correct -spack style --root-relative +spack style --root-relative $BASE # verify that the license headers are present spack license verify |