diff options
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 17cb3c89f74..d39d6c427ff 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:master-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 @@ -44,6 +37,17 @@ jobs: echo "Importing hotfixes database updates" cat sql/updates/hotfixes/master/*.sql | mysql -h 127.0.0.1 -uroot hotfixes - 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: | cd bin @@ -110,5 +114,6 @@ workflows: version: 2 build_all: jobs: - - pch_and_sql + - codestyle_and_sql + - pch - nopch |