From 6c7b8837d32aace0fb085406f22e6bfdcafa8aaf Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 25 Nov 2021 20:45:22 +0200
Subject: [PATCH] ci: Always run merge_base_script first for consistency

---
 .cirrus.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index c3cc776926f..460906817e0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -269,10 +269,11 @@ task:
 
 task:
   name: 'macOS 10.15 [gui, no tests] [focal]'
+  << : *BASE_TEMPLATE
   macos_sdk_cache:
     folder: "depends/SDKs/$MACOS_SDK"
     fingerprint_key: "$MACOS_SDK"
-  << : *GLOBAL_TASK_TEMPLATE
+  << : *MAIN_TEMPLATE
   container:
     image: ubuntu:focal
   env: