dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-08 10:31:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge 85a5e4bccc into beac01d5d1

Browse Source
This commit is contained in:
Megamouse 2026-04-08 07:55:19 +00:00 committed by GitHub
commit 699f977fd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/rpcs3.yml vendored
View File

@ -30,23 +30,23 @@ jobs:
matrix:
include:
- os: ubuntu-24.04
docker_img: "rpcs3/rpcs3-ci-jammy:1.10"
docker_img: "rpcs3/rpcs3-ci-jammy:1.11"
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.10"
docker_img: "rpcs3/rpcs3-ci-jammy:1.11"
build_sh: "/rpcs3/.ci/build-linux.sh"
compiler: gcc
- os: ubuntu-24.04-arm
docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.10"
docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.11"
build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
compiler: clang
UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1
UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux-arm64"
- os: ubuntu-24.04-arm
docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.10"
docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.11"
build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
compiler: gcc
name: RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }}

2
3rdparty/ffmpeg vendored

@ -1 +1 @@
Subproject commit ce81114ed99e5510f6cd983f59a1eac9f33bb73c
Subproject commit 199c92bee7146c9df383c4045b6ad03961c46808