From 2d3c6faec414b1f92729f4a1e1ef7bba919f4445 Mon Sep 17 00:00:00 2001 From: psi29a Date: Tue, 26 Oct 2021 08:59:11 +0000 Subject: [PATCH] Merge branch 'conditional_push_builds' into 'master' Add support for daily builds See merge request OpenMW/openmw!1314 (cherry picked from commit 50ea9869528c984b8ea66864fa08f5f710734eff) 1ee18b88 Update .gitlab-ci.yml file 603b0ad8 Update .gitlab-ci.yml a69cc468 Update .gitlab-ci.yml --- .gitlab-ci.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b69e930ae2..a07dec1d68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,9 @@ stages: - docker - linux image: debian:bullseye + rules: + - if: $CI_PIPELINE_SOURCE == "push" + .Debian: extends: .Debian_Image @@ -52,7 +55,7 @@ Coverity: extends: .Debian_Image stage: build rules: - - if: '$CI_PIPELINE_SOURCE == "schedule"' + - if: $CI_PIPELINE_SOURCE == "schedule" before_script: - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic coverity - curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN @@ -70,7 +73,6 @@ Coverity: variables: CC: gcc CXX: g++ - artifacts: Debian_GCC: extends: .Debian @@ -162,6 +164,7 @@ Debian_Clang_tests_Debug: only: variables: - $CI_PROJECT_ID == "7107382" + - $CI_PIPELINE_SOURCE == "push" cache: paths: - ccache/ @@ -213,6 +216,8 @@ variables: &tests-targets .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 @@ -329,6 +334,8 @@ Windows_Ninja_Tests_RelWithDebInfo: .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 @@ -389,6 +396,15 @@ Windows_Ninja_Tests_RelWithDebInfo: - MSVC2019_64/*/*/*/*/*/*/*.log - MSVC2019_64/*/*/*/*/*/*/*/*.log +Daily_Windows_MSBuild_Engine_Release:on-schedule: + extends: + - .Windows_MSBuild_Base + variables: + <<: *engine-targets + config: "Release" + rules: + - if: $CI_PIPELINE_SOURCE == "schedule" + Windows_MSBuild_Engine_Release: extends: - .Windows_MSBuild_Base @@ -444,6 +460,8 @@ Debian_AndroidNDK_arm64-v8a: tags: - linux image: debian:bullseye + rules: + - if: $CI_PIPELINE_SOURCE == "push" variables: CCACHE_SIZE: 3G cache: