summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBret Curtis <psi29a@gmail.com>2023-02-27 12:12:22 +0100
committerBret Curtis <psi29a@gmail.com>2023-02-27 12:12:22 +0100
commit03554a896d36d8a5d409ec8f0dfcf849c730b820 (patch)
treec60e0c6632bdc2b549b864b327e49846ecabcd87
parent331d207d3e03ea6253ae7bb7fc618e5e80ca2ae1 (diff)
be sure to add merge_request_event as this impacts new users MRsupdate_gitlab_rules
-rw-r--r--.gitlab-ci.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d4a3ee193..21a94b5413 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,7 @@ variables:
image: ubuntu:22.04
rules:
- if: $CI_PIPELINE_SOURCE == "push"
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
.Ubuntu:
extends: .Ubuntu_Image
@@ -267,6 +268,7 @@ Ubuntu_GCC_tests_coverage:
.Ubuntu_Static_Deps:
extends: Ubuntu_Clang
rules:
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
- if: $CI_PIPELINE_SOURCE == "push"
changes:
- "**/CMakeLists.txt"
@@ -420,6 +422,7 @@ macOS12_Xcode13:
- windows
rules:
- if: $CI_PIPELINE_SOURCE == "push"
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
before_script:
- Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
- choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
@@ -523,6 +526,7 @@ macOS12_Xcode13:
- windows
rules:
- if: $CI_PIPELINE_SOURCE == "push"
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
before_script:
- Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
- choco source add -n=openmw-proxy -s="https://repo.openmw.org/repository/Chocolatey/" --priority=1
@@ -620,6 +624,7 @@ 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"
@@ -629,6 +634,7 @@ Windows_MSBuild_RelWithDebInfo:
image: psi29a/android-ndk:focal-ndk22
rules:
- if: $CI_PIPELINE_SOURCE == "push"
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
variables:
CCACHE_SIZE: 3G
cache: