Commit 5f7c957d authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

CI: Simplify release model to single master branch, and tags off of it

parent 81020be0
...@@ -21,13 +21,10 @@ ...@@ -21,13 +21,10 @@
# #
# https://hub.docker.com/u/pauldmccarthy/ # https://hub.docker.com/u/pauldmccarthy/
# #
# The test and style stages are executed on all branches of upstream and # The test and style stages are executed on all branches.
# fork repositories.
# #
# The doc stage is executed on release branches of the upstream repository. # The doc, build, and deploy stages are executed on tags, and the deploy
# # stage must be manually instantiated.
# The build stage and deploy stages are executed on tags on the upstream
# repository, and the deploy stage must be manually instantiated.
########################################################################### ###########################################################################
...@@ -73,20 +70,6 @@ variables: ...@@ -73,20 +70,6 @@ variables:
#################################### ####################################
.only_upstream: &only_upstream
only:
- branches@fsl/fsleyes/widgets
.only_master: &only_master
only:
- master@fsl/fsleyes/widgets
.only_release_branches: &only_release_branches
only:
- /^v.+$/@fsl/fsleyes/widgets
.only_releases: &only_releases .only_releases: &only_releases
only: only:
...@@ -123,9 +106,6 @@ variables: ...@@ -123,9 +106,6 @@ variables:
.test: &test_template .test: &test_template
<<: *setup_ssh <<: *setup_ssh
# Releases are just tags on a release
# branch, so we don't need to test them.
<<: *except_releases <<: *except_releases
tags: tags:
...@@ -181,7 +161,7 @@ style: ...@@ -181,7 +161,7 @@ style:
########### ###########
pages: pages:
<<: *only_release_branches <<: *only_releases
tags: tags:
- docker - docker
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment