From d4780e0b9632754df74b1845c1faad2f8d440464 Mon Sep 17 00:00:00 2001
From: Giacomo Pozzoni <giacomopoz@gmail.com>
Date: Thu, 30 Jul 2020 19:43:03 +0000
Subject: [PATCH] CI/CircleCI: Move codestyle and sql checks to their own step
 (#25175)

(cherry picked from commit f35582f98a6dbf7d031646bc3efe6b88d4694dcb)
---
 .circleci/config.yml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 033567126da..763f2626a57 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2
 jobs:
-  pch_and_sql:
+  codestyle_and_sql:
     docker:
       - image: funjoker/circle-ci:4.3.4-buildpacks-focal
       - image: circleci/mysql:8
@@ -18,13 +18,6 @@ jobs:
           command: |
             chmod +x contrib/check_codestyle.sh
             ./contrib/check_codestyle.sh
-      - run:
-          name: Setup
-          command: |
-            mkdir bin
-            cd bin
-            cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1
-            cd ..
       - run:
           name: SQL checks
           command: |
@@ -39,6 +32,21 @@ jobs:
             mysql -h 127.0.0.1 -uroot hotfixes < sql/base/dev/hotfixes_database.sql
             cat sql/updates/world/4.3.4/*.sql | mysql -h 127.0.0.1 -uroot world
             cat sql/updates/hotfixes/4.3.4/*.sql | mysql -h 127.0.0.1 -uroot hotfixes
+  pch:
+    docker:
+      - image: funjoker/circle-ci:4.3.4-buildpacks-focal
+    steps:
+      - run:
+          name: Checkout
+          command: |
+            /scripts/checkout.sh
+      - run:
+          name: Setup
+          command: |
+            mkdir bin
+            cd bin
+            cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1
+            cd ..
       - run:
           name: Build
           command: |
@@ -121,5 +129,6 @@ workflows:
   version: 2
   build_all:
     jobs:
-      - pch_and_sql
-      - nopch
\ No newline at end of file
+      - codestyle_and_sql
+      - pch
+      - nopch