eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run CI on stable branches.

Browse Source 
The stable branch is named "v2.<minor>.x".
This commit is contained in:
Milan Broz
2021-12-01 22:43:33 +01:00
parent feb4d24327
commit c4b66283fe
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -62,7 +62,7 @@ test-main-commit-job-debian:
rules: rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
when: never when: never
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
script: script:
- make -j - make -j
- make -j -C tests check-programs - make -j -C tests check-programs
@@ -82,7 +82,7 @@ test-main-commit-job-dnf:
rules: rules:
- if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup" - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
when: never when: never
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
script: script:
- make -j - make -j
- make -j -C tests check-programs - make -j -C tests check-programs

2
.gitlab/ci/gitlab-shared-docker.yml
View File

@@ -5,7 +5,7 @@
stage: test stage: test
interruptible: true interruptible: true
rules: rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
before_script: before_script:
- .gitlab/ci/cibuild-setup-ubuntu.sh - .gitlab/ci/cibuild-setup-ubuntu.sh
- export CC="${COMPILER}${COMPILER_VERSION:+-$COMPILER_VERSION}" - export CC="${COMPILER}${COMPILER_VERSION:+-$COMPILER_VERSION}"