diff options
| author | Robert Helgesson <robert@rycee.net> | 2020-04-08 16:13:01 +0200 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2020-04-08 16:13:01 +0200 |
| commit | 068ff76a10e95820f886ac46957edcff4e44621d (patch) | |
| tree | fdf0f270e4baf08a497e5c0e3f3db7b3dd0554c3 /.gitlab-ci.yml | |
| parent | b7737f17322e648a7739529c4728b99b4b65ff5b (diff) | |
gitlab-ci: improve NUR update trigger
Specifically, trigger NUR updates for all release branches by default.
Also updates the GitLab CI definition to use the new `rules` attribute
rather than the deprecated `only` attribute.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7c14abb69e..fd1870ccff3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,9 @@ Run tests: stage: test script: - nix-shell tests -A run.files-text - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == "master" + when: always pages: stage: deploy @@ -26,8 +27,9 @@ pages: artifacts: paths: - public - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == "master" + when: always Deploy NUR: stage: deploy @@ -37,5 +39,6 @@ Deploy NUR: trigger: project: rycee/nur-expressions branch: master - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH =~ /^release-/ + when: always |