diff options
| author | funjoker <funjoker109@gmail.com> | 2022-09-14 11:02:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-14 11:02:17 +0200 |
| commit | 189ea0b1a5e4bbaa88638aee54934d4e540ccb50 (patch) | |
| tree | ad0ecef6ff8c85787472a743b75b48b46c52bb68 | |
| parent | 8a183a6e5ee1cd394aabb9df4e34064466bd3946 (diff) | |
CircleCI: Update to new images (#28243)
* Tests: Update Catch2 to v2.13.9
| -rw-r--r-- | .circleci/config.yml | 8 | ||||
| -rw-r--r-- | dep/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 0d63732bd42..6bf51f5a57c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,11 +2,11 @@ version: 2 jobs: codestyle_and_sql: docker: - - image: trinitycore/circle-ci:master-buildpacks-hirsute + - image: trinitycore/circle-ci:master-base-22.04 auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD - - image: circleci/mysql:8 + - image: cimg/mysql:8.0 auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD @@ -44,7 +44,7 @@ jobs: cat sql/updates/hotfixes/master/*.sql | mysql -h 127.0.0.1 -uroot hotfixes pch: docker: - - image: trinitycore/circle-ci:master-buildpacks-hirsute + - image: trinitycore/circle-ci:master-base-22.04 auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD @@ -103,7 +103,7 @@ jobs: path: docker.tar.gz nopch: docker: - - image: trinitycore/circle-ci:master-buildpacks-hirsute + - image: trinitycore/circle-ci:master-base-22.04 auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt index 55170ed1a15..b0b28c09bf1 100644 --- a/dep/CMakeLists.txt +++ b/dep/CMakeLists.txt @@ -42,7 +42,7 @@ if(BUILD_TESTING) include(FetchContent) FetchContent_Declare(Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git - GIT_TAG v2.13.0 + GIT_TAG v2.13.9 GIT_SHALLOW 1) FetchContent_MakeAvailable(Catch2) endif() |