diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-07-30 19:43:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-30 21:43:03 +0200 |
| commit | f35582f98a6dbf7d031646bc3efe6b88d4694dcb (patch) | |
| tree | 45cde1185e8f0c7ae3c8a6bd7ea2297b6680cfc1 | |
| parent | deceb11b5fc52c8036f249d628ccc69ca5d022b3 (diff) | |
CI/CircleCI: Move codestyle and sql checks to their own step (#25175)
| -rw-r--r-- | .circleci/config.yml | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index e96539968a4..2f969db8e8e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2 jobs: - pch_and_sql: + codestyle_and_sql: docker: - image: trinitycore/circle-ci:3.3.5-buildpacks-focal - image: circleci/mysql:8 @@ -19,13 +19,6 @@ jobs: 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=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 -DBUILD_TESTING=1 - cd .. - - run: name: SQL checks command: | chmod +x contrib/check_updates.sh @@ -37,6 +30,21 @@ jobs: ./contrib/check_updates.sh characters 3.3.5 characters 127.0.0.1 mysql -h 127.0.0.1 -uroot world < sql/base/dev/world_database.sql cat sql/updates/world/3.3.5/*.sql | mysql -h 127.0.0.1 -uroot world + pch: + docker: + - image: trinitycore/circle-ci:3.3.5-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=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 -DBUILD_TESTING=1 + cd .. - run: name: Build command: | @@ -104,5 +112,6 @@ workflows: version: 2 build_all: jobs: - - pch_and_sql + - codestyle_and_sql + - pch - nopch |