From 869a0ce2c1d9fe9c8bf29e53155d598c3a125b07 Mon Sep 17 00:00:00 2001
From: Matt <3397065-ZehMatt@users.noreply.gitlab.com>
Date: Thu, 15 Sep 2022 13:58:32 +0000
Subject: [PATCH] Revert "Merge branch 'ci-improvement' into 'master'"

This reverts merge request !2387
---
 .gitlab-ci.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd58217b33..54c9251880 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,5 @@
 default:
   interruptible: true
-  
-# Merge requests have two pipelines, filter pipelines using branch and merge request event together.
-# See https://docs.gitlab.com/ee/ci/pipelines/merge_request_pipelines.html#two-pipelines-when-pushing-to-a-branch
-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
-      when: never
-    - if: $CI_COMMIT_BRANCH
 
 # Note: We set `needs` on each job to control the job DAG.
 # See https://docs.gitlab.com/ee/ci/yaml/#needs
@@ -29,6 +20,8 @@ variables:
     - docker
     - linux
   image: ubuntu:22.04
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"
 
 .Ubuntu:
   extends: .Ubuntu_Image
@@ -395,6 +388,8 @@ macOS12_Xcode13:
 .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
@@ -496,6 +491,8 @@ macOS12_Xcode13:
 .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
@@ -593,9 +590,9 @@ 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"
 
+
 .Ubuntu_AndroidNDK_arm64-v8a:
   tags:
     - linux