From 068ff76a10e95820f886ac46957edcff4e44621d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 8 Apr 2020 16:13:01 +0200
Subject: [PATCH] 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.
---
 .gitlab-ci.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7c14abb..fd1870cc 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