mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-19 19:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/rpcs3.yml vendored
View file

@ -25,17 +25,17 @@ jobs:
matrix: matrix:
include: include:
- os: ubuntu-24.04 - 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" build_sh: "/rpcs3/.ci/build-linux.sh"
compiler: clang compiler: clang
UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux" UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
- os: ubuntu-24.04 - 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" build_sh: "/rpcs3/.ci/build-linux.sh"
compiler: gcc compiler: gcc
- os: ubuntu-24.04-arm - 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" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
compiler: clang compiler: clang
UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1 UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1

1
3rdparty/MoltenVK/CMakeLists.txt vendored
View file

@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(moltenvk NONE) project(moltenvk NONE)
include(ExternalProject) include(ExternalProject)

2
3rdparty/discord-rpc/discord-rpc vendored

@ -1 +1 @@
Subproject commit 171b2142ac8acdf016c231e36dc7a8d48daff19c Subproject commit 3dc2c326cb4dc5815c6069970c13154898f58d48

2
3rdparty/libusb/CMakeLists.txt vendored
View file

@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.0)
project(libusb) project(libusb)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")

2
CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.16.9) cmake_minimum_required(VERSION 3.28)
project(rpcs3 LANGUAGES C CXX) project(rpcs3 LANGUAGES C CXX)

4
azure-pipelines.yml
View file

@ -40,13 +40,13 @@ jobs:
# displayName: ccache # displayName: ccache
# - bash: | # - bash: |
# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.3 # docker pull --quiet rpcs3/rpcs3-ci-jammy:1.4
# docker run \ # docker run \
# -v $(pwd):/rpcs3 \ # -v $(pwd):/rpcs3 \
# --env-file .ci/docker.env \ # --env-file .ci/docker.env \
# -v $CCACHE_DIR:/root/.ccache \ # -v $CCACHE_DIR:/root/.ccache \
# -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ # -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
# rpcs3/rpcs3-ci-jammy:1.3 \ # rpcs3/rpcs3-ci-jammy:1.4 \
# /rpcs3/.ci/build-linux.sh # /rpcs3/.ci/build-linux.sh
# displayName: Docker setup and build # displayName: Docker setup and build