diff --git a/.gitlab-ci-files/package.yml b/.gitlab-ci-files/package.yml index f2c8991..bdcedfc 100644 --- a/.gitlab-ci-files/package.yml +++ b/.gitlab-ci-files/package.yml @@ -58,6 +58,7 @@ remi-rocky9-package: .remi-rocky-package: extends: .package rules: + - if: $CI_COMMIT_REF_NAME =~ /^release/ || $CI_COMMIT_REF_NAME == "master" - changes: - .gitlab-ci.yml script: diff --git a/.gitlab-ci-files/test.yml b/.gitlab-ci-files/test.yml index 5269757..e9b34b9 100644 --- a/.gitlab-ci-files/test.yml +++ b/.gitlab-ci-files/test.yml @@ -53,9 +53,6 @@ mysql-latest-test: DB_DATABASE: flexiapi DB_PASSWORD: flexiapi DB_USERNAME: root - rules: - - changes: - - flexiapi/database/migrations/* script: - apt update - apt install -y ./build/*.deb diff --git a/CHANGELOG.md b/CHANGELOG.md index 748c514..82dc1b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,7 @@ v2.0 - Fix FLEXIAPI-356 Cleanup and reorganize the pipeline to mutualize some things and save time - Fix FLEXIAPI-355 Add withoutGlobalScope() to the Account ContactVcardList resolver - Fix FLEXIAPI-354 Fix contact deletion +- Fix FLEXIAPI-360 Add rules on some jobs to only run them in the Gitlab pipeline when needed v1.6 ----