From 0ccbc5d8654cc8e5738d2094112a9b027f2adaaf Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 9 Jan 2025 15:13:16 -0600 Subject: [PATCH] Fix Tech Preview branding Our tests for the master branch don't work anymore since renaming it to main. Part-of: --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93df2771c..ff0161f3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,10 +74,10 @@ check-code-style: - if: $CI_COMMIT_BRANCH =~ /gnome-\d\d+/ variables: CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled -Dgranite=enabled' - - if: $CI_COMMIT_BRANCH == "master" + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH variables: CONFIG_OPTS: '-Dtech_preview=true -Dprofile=Devel -Dunit_tests=enabled -Dgranite=enabled' - - if: $CI_COMMIT_BRANCH !~ /gnome-\d\d+/ && $CI_COMMIT_BRANCH != "master" + - if: $CI_COMMIT_BRANCH !~ /gnome-\d\d+/ && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH variables: CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled -Dgranite=enabled --werror'