diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24203a25e6..bd58217b33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,8 +29,6 @@ variables: - docker - linux image: ubuntu:22.04 - rules: - - if: $CI_PIPELINE_SOURCE == "push" .Ubuntu: extends: .Ubuntu_Image @@ -397,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 @@ -500,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 @@ -599,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