Skip to content
Snippets Groups Projects
Commit 5b63ec86 authored by Todd Gamblin's avatar Todd Gamblin
Browse files

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`
parent fc94dde3
No related branches found
No related tags found
No related merge requests found
...@@ -3,13 +3,12 @@ name: linux builds ...@@ -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,13 +3,12 @@ name: macos tests ...@@ -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 ...@@ -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:
......
# 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, ...@@ -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(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment