From 675f599072e7133088f0ebd93cab57cf543fbab6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 31 Dec 2022 20:50:05 -0600
Subject: [PATCH] GitLab CI: fix default branch rules

---
 .gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 008550826..51f878342 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,8 @@ danger:
     - export CI_MERGE_REQUEST_IID=${CI_OPEN_MERGE_REQUESTS#*!}
     - npx danger ci
   except:
-    refs:
-      - $CI_DEFAULT_BRANCH
+    variables:
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
   allow_failure: true
 
 lint-js:
@@ -115,8 +115,8 @@ docs-deploy:
   script:
     - curl -X POST -F"token=$CI_JOB_TOKEN" -F'ref=master' https://gitlab.com/api/v4/projects/15685485/trigger/pipeline
   only:
-    refs:
-      - $CI_DEFAULT_BRANCH
+    variables:
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
     changes:
       - "docs/**/*"
 
@@ -141,8 +141,8 @@ pages:
     paths:
     - public
   only:
-    refs:
-      - $CI_DEFAULT_BRANCH
+    variables:
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 
 docker:
   stage: deploy
@@ -157,8 +157,8 @@ docker:
     - docker build -t $CI_REGISTRY_IMAGE .
     - docker push $CI_REGISTRY_IMAGE
   only:
-    refs:
-      - $CI_DEFAULT_BRANCH
+    variables:
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 
 include:
   - template: Jobs/Dependency-Scanning.gitlab-ci.yml