CI/Circle CI: Prepare circle-ci

.circleci/config.yml

@@ -0,0 +1,97 @@
+version: 2
+jobs:
+  pch_and_sql:
+    docker:
+      - image: funjoker/circle-ci:4.3.4-buildpacks-disco
+      - image: circleci/mysql:5.7
+        environment:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_ROOT_PASSWORD: ''
+          MYSQL_DATABASE: test_mysql
+    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=dynamic -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
+            cd ..
+      - run:
+          name: SQL checks
+          command: |
+            chmod +x contrib/check_updates.sh
+            dockerize -wait tcp://127.0.0.1:3306 -timeout 120s
+            mysql -h 127.0.0.1 -uroot < sql/create/create_mysql.sql
+            mysql -h 127.0.0.1 -uroot auth < sql/base/auth_database.sql
+            ./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
+            mysql -h 127.0.0.1 -uroot world < sql/base/dev/world_database.sql
+            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
+            mysql -h 127.0.0.1 -uroot < sql/create/drop_mysql.sql
+      - run:
+          name: Build
+          command: |
+            cd bin
+            make -j 4 -k && make install
+            cd check_install/bin
+            ./bnetserver --version
+            ./worldserver --version
+  nopch:
+    docker:
+      - image: funjoker/circle-ci:4.3.4-buildpacks-disco
+    steps:
+      - run:
+          name: Requirements
+          command: |
+            sudo mkdir -p /root/.ccache
+            sudo chown -Rv circleci:circleci /root
+      - run:
+          name: Checkout
+          command: |
+            /scripts/checkout.sh
+      - restore_cache:
+          keys:
+            - nopch-{{ .Branch }}-{{ .Revision }}
+            - nopch-{{ .Branch }}
+            - nopch
+      - run:
+          name: Setup
+          command: |
+            export CCACHE_MAXSIZE="1G"
+            export CC="ccache clang"
+            export CXX="ccache clang++"
+            export CCACHE_CPP2=yes
+            export USE_CCACHE=1
+            export PATH=/usr/lib/ccache:$PATH
+            ccache -s
+            git config user.email "circleci@build.bot" && git config user.name "Circle CI"
+            $CXX --version
+            mkdir bin
+            cd bin
+            cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -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
+            cd ..
+      - run:
+          name: Build
+          command: |
+            cd bin
+            make -j 4 -k && make install
+            ccache -s
+            cd check_install/bin
+            ./bnetserver --version
+            ./worldserver --version
+      - save_cache:
+          key: nopch-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - /home/circleci/.ccache
+workflows:
+  version: 2
+  build_all:
+    jobs:
+      - pch_and_sql
+      - nopch

.travis.yml

@@ -42,9 +42,9 @@ script:
   - $CXX --version
   - mysql -uroot < sql/create/create_mysql.sql
   - mysql -utrinity -ptrinity auth < sql/base/auth_database.sql
-  - ./contrib/check_updates.sh auth 4.3.4 auth
+  - ./contrib/check_updates.sh auth 4.3.4 auth localhost
   - mysql -utrinity -ptrinity characters < sql/base/characters_database.sql
-  - ./contrib/check_updates.sh characters 4.3.4 characters
+  - ./contrib/check_updates.sh characters 4.3.4 characters localhost
   - mysql -utrinity -ptrinity world < sql/base/dev/world_database.sql
   - mysql -utrinity -ptrinity hotfixes < sql/base/dev/hotfixes_database.sql
   - cat sql/updates/world/4.3.4/*.sql | mysql -utrinity -ptrinity world

contrib/check_updates.sh

@@ -2,13 +2,14 @@
 name=$1
 branch=$2
 database=$3
+host=$4
 
 echo "Database Updater check script:"
 echo "  Checking database '${name}' for missing filenames in tables..."
 echo
 
 # Select all entries which are in the updates table
-entries=$(mysql -uroot ${database} -e "SELECT name FROM updates" | grep ".sql")
+entries=$(mysql -uroot ${database} -h ${host} -e "SELECT name FROM updates" | grep ".sql")
 
 cd sql/updates/${name}/${branch}