From c9fe80a6cfd9caeb51fbb45ec24bcf11f37063ed Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Mon, 31 Mar 2025 20:03:28 -0700 Subject: [PATCH] Update docker cmake to 3.28 and update minimum to 3.28, as well as remove uneeded minimum --- .github/workflows/rpcs3.yml | 6 +++--- 3rdparty/MoltenVK/CMakeLists.txt | 1 - 3rdparty/discord-rpc/discord-rpc | 2 +- 3rdparty/libusb/CMakeLists.txt | 2 -- CMakeLists.txt | 2 +- azure-pipelines.yml | 4 ++-- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index d468496f76..e27952bea3 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -25,17 +25,17 @@ jobs: matrix: include: - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.3" + docker_img: "rpcs3/rpcs3-ci-jammy:1.4" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: clang UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux" - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.3" + docker_img: "rpcs3/rpcs3-ci-jammy:1.4" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: gcc - os: ubuntu-24.04-arm - docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.3" + docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.4" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh" compiler: clang UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1 diff --git a/3rdparty/MoltenVK/CMakeLists.txt b/3rdparty/MoltenVK/CMakeLists.txt index fc1b93074c..59959eecd5 100644 --- a/3rdparty/MoltenVK/CMakeLists.txt +++ b/3rdparty/MoltenVK/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 2.8.12) project(moltenvk NONE) include(ExternalProject) diff --git a/3rdparty/discord-rpc/discord-rpc b/3rdparty/discord-rpc/discord-rpc index 171b2142ac..3dc2c326cb 160000 --- a/3rdparty/discord-rpc/discord-rpc +++ b/3rdparty/discord-rpc/discord-rpc @@ -1 +1 @@ -Subproject commit 171b2142ac8acdf016c231e36dc7a8d48daff19c +Subproject commit 3dc2c326cb4dc5815c6069970c13154898f58d48 diff --git a/3rdparty/libusb/CMakeLists.txt b/3rdparty/libusb/CMakeLists.txt index 7d65aab0ad..0fc66f2429 100644 --- a/3rdparty/libusb/CMakeLists.txt +++ b/3rdparty/libusb/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.0) - project(libusb) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules") diff --git a/CMakeLists.txt b/CMakeLists.txt index 2208f2335e..40f48a6d5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16.9) +cmake_minimum_required(VERSION 3.28) project(rpcs3 LANGUAGES C CXX) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bc09a1524f..8e2ef1d8fb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,13 +40,13 @@ jobs: # displayName: ccache # - bash: | -# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.3 +# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.4 # docker run \ # -v $(pwd):/rpcs3 \ # --env-file .ci/docker.env \ # -v $CCACHE_DIR:/root/.ccache \ # -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ -# rpcs3/rpcs3-ci-jammy:1.3 \ +# rpcs3/rpcs3-ci-jammy:1.4 \ # /rpcs3/.ci/build-linux.sh # displayName: Docker setup and build