Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update docker cmake to 3.28 and update minimum to 3.28, as well as remove uneeded minimum

Browse Source
This commit is contained in:
Zion Nimchuk
2025-03-31 20:03:28 -07:00
committed by Elad
parent 5526c33d69
commit 89ae495c36
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/rpcs3.yml
+3 -3
View File
@@ -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
3rdparty/MoltenVK/CMakeLists.txt
Vendored
-1
View File
@@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(moltenvk NONE)
include(ExternalProject)
3rdparty/discord-rpc/discord-rpc
Vendored
+1 -1
Submodule 3rdparty/discord-rpc/discord-rpc updated: 171b2142ac...3dc2c326cb
3rdparty/libusb/CMakeLists.txt
Vendored
-2
View File
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.0)
project(libusb)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.16.9)
cmake_minimum_required(VERSION 3.28)
project(rpcs3 LANGUAGES C CXX)
azure-pipelines.yml
+2 -2
View File
@@ -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