diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54c9251880..bd58217b33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,14 @@ default: interruptible: true + +# Merge requests have two pipelines, filter pipelines using branch and merge request event together. +# See https://docs.gitlab.com/ee/ci/pipelines/merge_request_pipelines.html#two-pipelines-when-pushing-to-a-branch +workflow: + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS + when: never + - if: $CI_COMMIT_BRANCH # Note: We set `needs` on each job to control the job DAG. # See https://docs.gitlab.com/ee/ci/yaml/#needs @@ -20,8 +29,6 @@ variables: - docker - linux image: ubuntu:22.04 - rules: - - if: $CI_PIPELINE_SOURCE == "push" .Ubuntu: extends: .Ubuntu_Image @@ -388,8 +395,6 @@ macOS12_Xcode13: .Windows_Ninja_Base: tags: - windows - rules: - - if: $CI_PIPELINE_SOURCE == "push" before_script: - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" - choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1 @@ -491,8 +496,6 @@ macOS12_Xcode13: .Windows_MSBuild_Base: tags: - windows - rules: - - if: $CI_PIPELINE_SOURCE == "push" before_script: - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" - choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1 @@ -590,9 +593,9 @@ Windows_MSBuild_RelWithDebInfo: rules: # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it - if: $CI_PIPELINE_SOURCE == "push" + - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "schedule" - .Ubuntu_AndroidNDK_arm64-v8a: tags: - linux