From 87e0a28482eff3dde9f6cfaf93cfc819f3bc3e15 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 7 Jan 2021 16:03:10 +0000 Subject: [PATCH 1/2] ci: Specify `only` for other jobs Otherwise MRs will only run macOS jobs. --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b5ee631a3..1c53f4f0f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,6 +43,7 @@ style-check-diff: - .gitlab-ci/run-style-check-diff.sh .build-fedora-default: + extends: .only-default image: $FEDORA_IMAGE artifacts: when: always @@ -121,6 +122,7 @@ installed-tests: .mingw-defaults: + extends: .only-default stage: build tags: - win32-ps @@ -145,12 +147,10 @@ msys2-mingw64: CHERE_INVOKING: "yes" macos: + extends: .only-default stage: build tags: - macos - only: - - master - - merge_requests needs: [] before_script: - bash .gitlab-ci/show-execution-environment.sh From 195b98f19aaba342305d3289bca98563ce959284 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 7 Jan 2021 16:14:04 +0000 Subject: [PATCH 2/2] ci: Only run macOS job on upstream branches Don't run CI on macOS for forks. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c53f4f0f6..1f662c3a7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,6 +148,8 @@ msys2-mingw64: macos: extends: .only-default + only: + - branches@GNOME/gtk stage: build tags: - macos