diff options
| author | funjoker <funjoker109@gmail.com> | 2022-09-14 11:02:17 +0200 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2022-09-14 11:12:29 +0200 |
| commit | 6372ba3f74e799077e9b2fad7859558b2a25cfbc (patch) | |
| tree | edc6af6e67bf78ca544d3996a3300f10eb44318d | |
| parent | de4920de81a495ed8d6b04cf68f3912c74921f48 (diff) | |
CircleCI: Update to new images (#28243)
* Tests: Update Catch2 to v2.13.9
(cherry picked from commit 189ea0b1a5e4bbaa88638aee54934d4e540ccb50)
| -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 24f041dc800..f175c7e9297 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,11 +2,11 @@ version: 2 jobs: codestyle_and_sql: docker: - - image: trinitycore/circle-ci:3.3.5-buildpacks-hirsute + - image: trinitycore/circle-ci:3.3.5-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 @@ -38,7 +38,7 @@ jobs: 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-hirsute + - image: trinitycore/circle-ci:3.3.5-base-22.04 auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD @@ -97,7 +97,7 @@ jobs: path: docker.tar.gz nopch: docker: - - image: trinitycore/circle-ci:3.3.5-buildpacks-hirsute + - image: trinitycore/circle-ci:3.3.5-base-22.04 auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt index 9c1b5cd9b97..a87f460ed95 100644 --- a/dep/CMakeLists.txt +++ b/dep/CMakeLists.txt @@ -40,7 +40,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() |