diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2020-07-03 23:52:11 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2020-07-06 11:39:19 -0700 |
| commit | 11088df4024a512c8e2fe88f9ffe848e9940f808 (patch) | |
| tree | 17f5c6d67c85f797f25c767068f45b912f5f2b02 | |
| parent | 4ea76dc95ce0992de869250c8570acbb59f9202c (diff) | |
| download | spack-11088df4024a512c8e2fe88f9ffe848e9940f808.tar.gz spack-11088df4024a512c8e2fe88f9ffe848e9940f808.tar.bz2 spack-11088df4024a512c8e2fe88f9ffe848e9940f808.tar.xz spack-11088df4024a512c8e2fe88f9ffe848e9940f808.zip | |
Remove references to `master` from CI
- [x] remove master from github actions
- [x] remove master from .travis.yml
- [x] make `develop` the default branch for `spack ci`
| -rw-r--r-- | .github/workflows/linux_build_tests.yaml | 3 | ||||
| -rw-r--r-- | .github/workflows/macos_unit_tests.yaml | 3 | ||||
| -rw-r--r-- | .github/workflows/minimum_python_versions.yaml | 3 | ||||
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | lib/spack/spack/ci.py | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/.github/workflows/linux_build_tests.yaml b/.github/workflows/linux_build_tests.yaml index ecdf38bfe4..3f5c575df3 100644 --- a/.github/workflows/linux_build_tests.yaml +++ b/.github/workflows/linux_build_tests.yaml @@ -3,13 +3,12 @@ name: linux builds on: push: branches: - - master - develop - releases/** pull_request: branches: - - master - develop + - releases/** paths-ignore: # Don't run if we only modified packages in the built-in repository - 'var/spack/repos/builtin/**' diff --git a/.github/workflows/macos_unit_tests.yaml b/.github/workflows/macos_unit_tests.yaml index 38feb2fc6a..f1e856070c 100644 --- a/.github/workflows/macos_unit_tests.yaml +++ b/.github/workflows/macos_unit_tests.yaml @@ -3,13 +3,12 @@ name: macos tests on: push: branches: - - master - develop - releases/** pull_request: branches: - - master - develop + - releases/** jobs: build: diff --git a/.github/workflows/minimum_python_versions.yaml b/.github/workflows/minimum_python_versions.yaml index 474f091514..a6ab5dfa40 100644 --- a/.github/workflows/minimum_python_versions.yaml +++ b/.github/workflows/minimum_python_versions.yaml @@ -3,13 +3,12 @@ name: python version check on: push: branches: - - master - develop - releases/** pull_request: branches: - - master - develop + - releases/** jobs: validate: diff --git a/.travis.yml b/.travis.yml index df4262bf1e..e4e6383dbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ -# Only build master and develop on push; do not build every branch. +# Only build releases and develop on push; do not build every branch. branches: only: - - master - develop - /^releases\/.*$/ diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py index 55d311d6a5..732b985dd1 100644 --- a/lib/spack/spack/ci.py +++ b/lib/spack/spack/ci.py @@ -493,7 +493,7 @@ def generate_gitlab_ci_yaml(env, print_summary, output_file, after_script = None if custom_spack_repo: if not custom_spack_ref: - custom_spack_ref = 'master' + custom_spack_ref = 'develop' before_script = [ ('git clone "{0}"'.format(custom_spack_repo)), 'pushd ./spack && git checkout "{0}" && popd'.format( |