CircleCI: Update to new images (#28243)

* Tests: Update Catch2 to v2.13.9

(cherry picked from commit 189ea0b1a5e4bbaa88638aee54934d4e540ccb50)

.circleci/config.yml

@@ -2,11 +2,11 @@ version: 2
 jobs:
   codestyle_and_sql:
     docker:
-      - image: cataclysmpreservationproject/circle-ci:4.3.4-buildpacks-hirsute
+      - image: cataclysmpreservationproject/circle-ci:4.3.4-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
@@ -40,7 +40,7 @@ jobs:
             cat sql/updates/hotfixes/4.3.4/*.sql | mysql -h 127.0.0.1 -uroot hotfixes
   pch:
     docker:
-      - image: cataclysmpreservationproject/circle-ci:4.3.4-buildpacks-hirsute
+      - image: cataclysmpreservationproject/circle-ci:4.3.4-base-22.04
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -88,7 +88,7 @@ jobs:
           path: docker.tar.gz
   nopch:
     docker:
-      - image: cataclysmpreservationproject/circle-ci:4.3.4-buildpacks-hirsute
+      - image: cataclysmpreservationproject/circle-ci:4.3.4-base-22.04
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

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()