mirror of
https://github.com/OpenMW/openmw.git
synced 2025-04-29 08:06:56 +00:00
Use merge_request_event as a source for CI jobs when there is MR
This commit is contained in:
parent
a14bbcb62f
commit
74e38148f3
1 changed files with 14 additions and 14 deletions
|
@ -8,6 +8,13 @@ stages:
|
||||||
- build
|
- build
|
||||||
- test
|
- test
|
||||||
|
|
||||||
|
workflow:
|
||||||
|
rules:
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
|
- if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
|
||||||
|
when: never
|
||||||
|
- if: $CI_COMMIT_BRANCH
|
||||||
|
|
||||||
# https://blog.nimbleways.com/let-s-make-faster-gitlab-ci-cd-pipelines/
|
# https://blog.nimbleways.com/let-s-make-faster-gitlab-ci-cd-pipelines/
|
||||||
variables:
|
variables:
|
||||||
FF_USE_NEW_SHELL_ESCAPE: "true"
|
FF_USE_NEW_SHELL_ESCAPE: "true"
|
||||||
|
@ -22,7 +29,7 @@ variables:
|
||||||
- linux
|
- linux
|
||||||
image: ubuntu:22.04
|
image: ubuntu:22.04
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "push"
|
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
|
|
||||||
.Ubuntu:
|
.Ubuntu:
|
||||||
extends: .Ubuntu_Image
|
extends: .Ubuntu_Image
|
||||||
|
@ -121,7 +128,7 @@ Ubuntu_GCC:
|
||||||
CCACHE_SIZE: 4G
|
CCACHE_SIZE: 4G
|
||||||
# When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
|
# When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
|
||||||
timeout: 2h
|
timeout: 2h
|
||||||
|
|
||||||
Clang_Format:
|
Clang_Format:
|
||||||
extends: .Ubuntu_Image
|
extends: .Ubuntu_Image
|
||||||
stage: checks
|
stage: checks
|
||||||
|
@ -270,7 +277,7 @@ Ubuntu_GCC_tests_coverage:
|
||||||
.Ubuntu_Static_Deps:
|
.Ubuntu_Static_Deps:
|
||||||
extends: Ubuntu_Clang
|
extends: Ubuntu_Clang
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "push"
|
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
changes:
|
changes:
|
||||||
- "**/CMakeLists.txt"
|
- "**/CMakeLists.txt"
|
||||||
- "cmake/**/*"
|
- "cmake/**/*"
|
||||||
|
@ -422,7 +429,7 @@ macOS12_Xcode13:
|
||||||
tags:
|
tags:
|
||||||
- windows
|
- windows
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "push"
|
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
before_script:
|
before_script:
|
||||||
- Get-Volume
|
- Get-Volume
|
||||||
- Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
|
- Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
|
||||||
|
@ -533,7 +540,7 @@ macOS12_Xcode13:
|
||||||
tags:
|
tags:
|
||||||
- windows
|
- windows
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "push"
|
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
before_script:
|
before_script:
|
||||||
- Get-Volume
|
- Get-Volume
|
||||||
- Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
|
- Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
|
||||||
|
@ -616,11 +623,6 @@ macOS12_Xcode13:
|
||||||
- .Windows_MSBuild_Base
|
- .Windows_MSBuild_Base
|
||||||
variables:
|
variables:
|
||||||
config: "Release"
|
config: "Release"
|
||||||
# temporarily disabled while this isn't the thing we link on the downloads page
|
|
||||||
# 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 == "schedule"
|
|
||||||
|
|
||||||
.Windows_MSBuild_Debug:
|
.Windows_MSBuild_Debug:
|
||||||
extends:
|
extends:
|
||||||
|
@ -638,16 +640,14 @@ Windows_MSBuild_RelWithDebInfo:
|
||||||
# temporarily enabled while we're linking these on the downloads page
|
# temporarily enabled while we're linking these on the downloads page
|
||||||
rules:
|
rules:
|
||||||
# run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
|
# 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 == "push" || $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "schedule"
|
||||||
- if: $CI_PIPELINE_SOURCE == "schedule"
|
|
||||||
|
|
||||||
|
|
||||||
.Ubuntu_AndroidNDK_arm64-v8a:
|
.Ubuntu_AndroidNDK_arm64-v8a:
|
||||||
tags:
|
tags:
|
||||||
- linux
|
- linux
|
||||||
image: psi29a/android-ndk:focal-ndk22
|
image: psi29a/android-ndk:focal-ndk22
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "push"
|
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
variables:
|
variables:
|
||||||
CCACHE_SIZE: 3G
|
CCACHE_SIZE: 3G
|
||||||
cache:
|
cache:
|
||||||
|
|
Loading…
Reference in a new issue