mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-11 15:36:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_ci' into 'master'

Browse source 
Use proper tags to run linux jobs

See merge request OpenMW/openmw!4082
This commit is contained in:
AnyOldName3 2024-05-08 23:12:36 +00:00
commit 56b685a9cc
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -25,8 +25,7 @@ variables:
.Ubuntu_Image: .Ubuntu_Image:
tags: tags:
- docker - saas-linux-medium-amd64
- linux
image: ubuntu:22.04 image: ubuntu:22.04
rules: rules:
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
@ -91,8 +90,7 @@ Ubuntu_GCC_preprocess:
Coverity: Coverity:
tags: tags:
- docker - saas-linux-medium-amd64
- linux
image: ubuntu:22.04 image: ubuntu:22.04
stage: build stage: build
rules: rules:
@ -756,7 +754,7 @@ Windows_MSBuild_RelWithDebInfo:
.Ubuntu_AndroidNDK_arm64-v8a: .Ubuntu_AndroidNDK_arm64-v8a:
tags: tags:
- linux - saas-linux-medium-amd64
image: psi29a/android-ndk:focal-ndk22 image: psi29a/android-ndk:focal-ndk22
rules: rules:
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"