From 3a7d71c9d109be6e6521304d00b52d3836d79eeb Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 7 Nov 2021 13:00:58 -0500
Subject: [PATCH] Fix CI for new default branch name
---
.gitlab-ci.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39d12f7db07..1930fff9c11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -251,13 +251,13 @@ coverity_scan:
key:
prefix: linux64
-.master_rules:
+.dev_rules:
rules:
- if: $BUILD_CHANNEL || $CI_COMMIT_TAG
when: never
- if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_PIPELINE_SOURCE == "schedule"'
- #- if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "push"'
+ #- if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
# when: delayed
# start_in: '12 hours'
variables:
@@ -285,25 +285,25 @@ coverity_scan:
variables:
VIEWER_CHANNEL_TYPE: Release
-build:master:linux64:
+build:dev:linux64:
extends:
- .linux64_build
- - .master_rules
+ - .dev_rules
-build:master:mac64:
+build:dev:mac64:
extends:
- .mac64_build
- - .master_rules
+ - .dev_rules
-.build:master:windows32:
+.build:dev:windows32:
extends:
- .win32_build
- - .master_rules
+ - .dev_rules
-build:master:windows64:
+build:dev:windows64:
extends:
- .win64_build
- - .master_rules
+ - .dev_rules
build:project:linux64:
extends:
--
GitLab