From c4b66283febbd4473a3b74c2c22e61eb215120cd Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 1 Dec 2021 22:43:33 +0100 Subject: [PATCH] Run CI on stable branches. The stable branch is named "v2..x". --- .gitlab-ci.yml | 4 ++-- .gitlab/ci/gitlab-shared-docker.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f681bb3..a12284f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ test-main-commit-job-debian: rules: - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" when: never - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/ script: - make -j - make -j -C tests check-programs @@ -82,7 +82,7 @@ test-main-commit-job-dnf: rules: - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" when: never - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/ script: - make -j - make -j -C tests check-programs diff --git a/.gitlab/ci/gitlab-shared-docker.yml b/.gitlab/ci/gitlab-shared-docker.yml index 8d3fba97..2be9da9a 100644 --- a/.gitlab/ci/gitlab-shared-docker.yml +++ b/.gitlab/ci/gitlab-shared-docker.yml @@ -5,7 +5,7 @@ stage: test interruptible: true rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/ before_script: - .gitlab/ci/cibuild-setup-ubuntu.sh - export CC="${COMPILER}${COMPILER_VERSION:+-$COMPILER_VERSION}"