From 4d8da1fcf30f946ca7486582aea121d46d2a0e40 Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Mon, 21 Aug 2023 17:03:54 +0200
Subject: [PATCH] CI/Cicle: sync config with trinity's master branch and no
 longer use the 4.3.4 branch name since we do work on our own master branch

---
 .circleci/config.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 41177126a5..b54cda32be 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   codestyle_and_sql:
     docker:
-      - image: cataclysmpreservationproject/circle-ci:4.3.4-base-22.04
+      - image: cataclysmpreservationproject/circle-ci:master-base-22.04
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -34,13 +34,17 @@ jobs:
             ./contrib/check_updates.sh auth 4.3.4 auth 127.0.0.1
             mysql -h 127.0.0.1 -uroot characters < sql/base/characters_database.sql
             ./contrib/check_updates.sh characters 4.3.4 characters 127.0.0.1
+            echo "Importing world database structure"
             mysql -h 127.0.0.1 -uroot world < sql/base/dev/world_database.sql
+            echo "Importing hotfixes database structure"
             mysql -h 127.0.0.1 -uroot hotfixes < sql/base/dev/hotfixes_database.sql
+            echo "Importing world database updates"
             cat sql/updates/world/4.3.4/*.sql | mysql -h 127.0.0.1 -uroot world
+            echo "Importing hotfixes database updates"
             cat sql/updates/hotfixes/4.3.4/*.sql | mysql -h 127.0.0.1 -uroot hotfixes
   pch:
     docker:
-      - image: cataclysmpreservationproject/circle-ci:4.3.4-base-22.04
+      - image: cataclysmpreservationproject/circle-ci:master-base-22.04
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -84,7 +88,7 @@ jobs:
             cd bin/check_install
             cp -r ../../contrib/Docker/* .
             cp -r ../../sql ./sql
-            image_prefix=$(echo cataclysmpreservationproject/$CIRCLE_PROJECT_REPONAME | tr '[:upper:]' '[:lower:]')
+            image_prefix=$(echo $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME | tr '[:upper:]' '[:lower:]')
             echo $image_prefix
             docker build --file Dockerfile --force-rm --tag $image_prefix:$CIRCLE_SHA1 --tag $image_prefix:$(echo $CIRCLE_BRANCH | tr '/' '-' | tr '[:upper:]' '[:lower:]') .
             docker save $image_prefix | gzip > ../../docker.tar.gz
@@ -99,11 +103,10 @@ jobs:
           path: docker.tar.gz
   nopch:
     docker:
-      - image: cataclysmpreservationproject/circle-ci:4.3.4-base-22.04
+      - image: cataclysmpreservationproject/circle-ci:master-base-22.04
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
-    resource_class: large
     steps:
       - run:
           name: Requirements
@@ -116,9 +119,9 @@ jobs:
             /scripts/checkout.sh
       - restore_cache:
           keys:
-            - 4.3.4-nopch-{{ .Branch }}-{{ .Revision }}
-            - 4.3.4-nopch-{{ .Branch }}
-            - 4.3.4-nopch
+            - master-nopch-{{ .Branch }}-{{ .Revision }}
+            - master-nopch-{{ .Branch }}
+            - master-nopch-master
       - run:
           name: Setup
           command: |
@@ -147,7 +150,7 @@ jobs:
             ./bnetserver --version
             ./worldserver --version
       - save_cache:
-          key: 4.3.4-nopch-{{ .Branch }}-{{ .Revision }}
+          key: master-nopch-{{ .Branch }}-{{ .Revision }}
           paths:
             - /home/circleci/.ccache
 workflows: