Skip to content
Snippets Groups Projects
Commit f61fdc5a authored by Sebastian Lobinger's avatar Sebastian Lobinger
Browse files

combination of only and except tp run jobs for master or others fix #25

parent 670745af
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -17,6 +17,8 @@ test-others: ...@@ -17,6 +17,8 @@ test-others:
- git config --global user.email ${GITLAB_USER_EMAIL} - git config --global user.email ${GITLAB_USER_EMAIL}
- git config --global user.name ${GITLAB_USER_ID} - git config --global user.name ${GITLAB_USER_ID}
- git merge origin/master --no-commit --no-ff - git merge origin/master --no-commit --no-ff
only:
- branches
except: except:
- master - master
...@@ -31,10 +33,12 @@ build-master: ...@@ -31,10 +33,12 @@ build-master:
artifacts: artifacts:
paths: paths:
- build/* - build/*
- ENVIRONMENTS - ./ENVIRONMENTS
expire_in: 1 hrs expire_in: 1 hrs
only: only:
- master - master
except:
- branches
environment: environment:
name: staging name: staging
...@@ -53,6 +57,8 @@ test-and-deploy-master: ...@@ -53,6 +57,8 @@ test-and-deploy-master:
only: only:
- tags - tags
- master - master
exceot:
- branches
artifacts: artifacts:
paths: paths:
- build/* - build/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment