From: Aida Jonikienė aidas957@gmail.com
This should prevent any build script mistakes from potentially messing up CI. --- tools/gitlab/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 5fb71cc36ca..c98983206b2 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -35,7 +35,7 @@ build-debian: extends: .wine-build rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || ($CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) + - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH artifacts: expire_in: 1 day paths: @@ -47,7 +47,7 @@ build-debian: build-debian-clang: extends: .wine-build rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || ($CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) + - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH script: - mkdir -p build32 build64 - ./tools/gitlab/build-clang @@ -59,7 +59,7 @@ build-mac: TART_EXECUTOR_SSH_USERNAME: "gitlab" TART_EXECUTOR_SSH_PASSWORD: "gitlab" rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || ($CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) + - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH tags: - mac artifacts: @@ -75,7 +75,7 @@ build-winetest: stage: build image: $CI_REGISTRY/wine/wine:debian-bookworm rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || ($CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) + - if: $CI_PIPELINE_SOURCE == 'trigger' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: - job: build-debian variables: