From 22c40be8aa71fc2ab8d6079a69ab2ce353dc6c21 Mon Sep 17 00:00:00 2001
From: David Byers <david.byers@liu.se>
Date: Thu, 11 Feb 2021 15:42:25 +0100
Subject: [PATCH] Move beta builds to master, release builds to release branch.
---
.gitlab-ci.yml | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78ece77..2b122db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ stages:
.release_rules: &release_rules
rules:
- - if: "$CI_COMMIT_TAG =~ /^release-/ && $CI_COMMIT_BRANCH == 'master'"
+ - if: "$CI_COMMIT_TAG =~ /^release-/ && $CI_COMMIT_BRANCH == 'release'"
when: always
- when: never
@@ -42,13 +42,13 @@ prepare:dev:
only:
- branches
except:
+ - release
- master
- - beta
prepare:beta:
extends: .prepare
only:
- - beta
+ - master
prepare:release:
extends: .prepare
@@ -82,13 +82,13 @@ build:edge:beta:
variables:
VARIANT: beta
rules:
- - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta"'
+ - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"'
changes:
- shared/**/*
- firefox/**/*
- edge/**/*
when: always
- - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|edge)/ && $CI_COMMIT_BRANCH == "beta"'
+ - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|edge)/ && $CI_COMMIT_BRANCH == "master"'
when: always
- when: never
@@ -126,12 +126,12 @@ build:firefox:beta:
CHANNEL: unlisted
VARIANT: beta
rules:
- - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta"'
+ - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"'
changes:
- shared/**/*
- firefox/**/*
when: always
- - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox)/ && $CI_COMMIT_BRANCH == "beta"'
+ - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|firefox)/ && $CI_COMMIT_BRANCH == "master"'
when: always
- when: never
@@ -164,12 +164,12 @@ build:thunderbird:beta:
variables:
VARIANT: beta
rules:
- - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "beta"'
+ - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"'
changes:
- shared/**/*
- thunderbird/**/*
when: always
- - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|thunderbird)/ && $CI_COMMIT_BRANCH == "beta"'
+ - if: '$CI_COMMIT_MESSAGE =~ /#force-build:(all|thunderbird)/ && $CI_COMMIT_BRANCH == "master"'
when: always
- when: never
@@ -192,7 +192,7 @@ collect:
script:
- echo "I have seen the CONSING!"
only:
- - beta
+ - master
pages:
stage: deploy
@@ -223,7 +223,7 @@ pages:
ref: $CI_COMMIT_REF_NAME
artifacts: true
only:
- - beta
+ - master
artifacts:
paths:
- public/
--
GitLab