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`
This commit is contained in:
parent
4ea76dc95c
commit
11088df402
5 changed files with 5 additions and 9 deletions
3
.github/workflows/linux_build_tests.yaml
vendored
3
.github/workflows/linux_build_tests.yaml
vendored
|
@ -3,13 +3,12 @@ name: linux builds
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
|
||||||
- develop
|
- develop
|
||||||
- releases/**
|
- releases/**
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- master
|
|
||||||
- develop
|
- develop
|
||||||
|
- releases/**
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
# Don't run if we only modified packages in the built-in repository
|
# Don't run if we only modified packages in the built-in repository
|
||||||
- 'var/spack/repos/builtin/**'
|
- 'var/spack/repos/builtin/**'
|
||||||
|
|
3
.github/workflows/macos_unit_tests.yaml
vendored
3
.github/workflows/macos_unit_tests.yaml
vendored
|
@ -3,13 +3,12 @@ name: macos tests
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
|
||||||
- develop
|
- develop
|
||||||
- releases/**
|
- releases/**
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- master
|
|
||||||
- develop
|
- develop
|
||||||
|
- releases/**
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
||||||
|
|
|
@ -3,13 +3,12 @@ name: python version check
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
|
||||||
- develop
|
- develop
|
||||||
- releases/**
|
- releases/**
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- master
|
|
||||||
- develop
|
- develop
|
||||||
|
- releases/**
|
||||||
jobs:
|
jobs:
|
||||||
validate:
|
validate:
|
||||||
|
|
||||||
|
|
|
@ -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:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
|
||||||
- develop
|
- develop
|
||||||
- /^releases\/.*$/
|
- /^releases\/.*$/
|
||||||
|
|
||||||
|
|
|
@ -493,7 +493,7 @@ def generate_gitlab_ci_yaml(env, print_summary, output_file,
|
||||||
after_script = None
|
after_script = None
|
||||||
if custom_spack_repo:
|
if custom_spack_repo:
|
||||||
if not custom_spack_ref:
|
if not custom_spack_ref:
|
||||||
custom_spack_ref = 'master'
|
custom_spack_ref = 'develop'
|
||||||
before_script = [
|
before_script = [
|
||||||
('git clone "{0}"'.format(custom_spack_repo)),
|
('git clone "{0}"'.format(custom_spack_repo)),
|
||||||
'pushd ./spack && git checkout "{0}" && popd'.format(
|
'pushd ./spack && git checkout "{0}" && popd'.format(
|
||||||
|
|
Loading…
Reference in a new issue