Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

CircleCI: Update to new images (#28243)

Browse Source 
* Tests: Update Catch2 to v2.13.9

(cherry picked from commit 189ea0b1a5e4bbaa88638aee54934d4e540ccb50)
This commit is contained in:
funjoker committed 2023-05-19 21:18:33 +02:00
1 parent 2509b96dec
commit a0ce411c0d
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.circleci/config.yml
+4 -4
View File
@@ -2,11 +2,11 @@ version: 2
jobs: jobs:
codestyle_and_sql: codestyle_and_sql:
docker: docker:
- image: cataclysmpreservationproject/circle-ci:4.3.4-buildpacks-hirsute - image: cataclysmpreservationproject/circle-ci:4.3.4-base-22.04
auth: auth:
username: $DOCKERHUB_USERNAME username: $DOCKERHUB_USERNAME
password: $DOCKERHUB_PASSWORD password: $DOCKERHUB_PASSWORD
- image: circleci/mysql:8 - image: cimg/mysql:8.0
auth: auth:
username: $DOCKERHUB_USERNAME username: $DOCKERHUB_USERNAME
password: $DOCKERHUB_PASSWORD password: $DOCKERHUB_PASSWORD
@@ -40,7 +40,7 @@ jobs:
cat sql/updates/hotfixes/4.3.4/*.sql | mysql -h 127.0.0.1 -uroot hotfixes cat sql/updates/hotfixes/4.3.4/*.sql | mysql -h 127.0.0.1 -uroot hotfixes
pch: pch:
docker: docker:
- image: cataclysmpreservationproject/circle-ci:4.3.4-buildpacks-hirsute - image: cataclysmpreservationproject/circle-ci:4.3.4-base-22.04
auth: auth:
username: $DOCKERHUB_USERNAME username: $DOCKERHUB_USERNAME
password: $DOCKERHUB_PASSWORD password: $DOCKERHUB_PASSWORD
@@ -88,7 +88,7 @@ jobs:
path: docker.tar.gz path: docker.tar.gz
nopch: nopch:
docker: docker:
- image: cataclysmpreservationproject/circle-ci:4.3.4-buildpacks-hirsute - image: cataclysmpreservationproject/circle-ci:4.3.4-base-22.04
auth: auth:
username: $DOCKERHUB_USERNAME username: $DOCKERHUB_USERNAME
password: $DOCKERHUB_PASSWORD password: $DOCKERHUB_PASSWORD
dep/CMakeLists.txt
+1 -1
View File
@@ -42,7 +42,7 @@ if(BUILD_TESTING)
include(FetchContent) include(FetchContent)
FetchContent_Declare(Catch2 FetchContent_Declare(Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v2.13.0 GIT_TAG v2.13.9
GIT_SHALLOW 1) GIT_SHALLOW 1)
FetchContent_MakeAvailable(Catch2) FetchContent_MakeAvailable(Catch2)
endif() endif()