archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Suggested review changes

Browse source
This commit is contained in:
schm1dtmac 2025-05-31 18:40:12 +01:00 • committed by Ani
parent 55aaffb7b3
commit 0f45c08188
4 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.ci/build-mac-arm64.sh
View file

@ -72,7 +72,6 @@ git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ &&
# 3rdparty fixes # 3rdparty fixes
sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
rm -rf build
mkdir build && cd build || exit 1 mkdir build && cd build || exit 1
export MACOSX_DEPLOYMENT_TARGET=14.0 export MACOSX_DEPLOYMENT_TARGET=14.0

1
.ci/build-mac.sh
View file

@ -75,7 +75,6 @@ git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ &&
# 3rdparty fixes # 3rdparty fixes
sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
rm -rf build
mkdir build && cd build || exit 1 mkdir build && cd build || exit 1
export MACOSX_DEPLOYMENT_TARGET=14.0 export MACOSX_DEPLOYMENT_TARGET=14.0

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

@ -114,20 +114,20 @@ jobs:
- name: Intel - name: Intel
build_sh: "arch -X86_64 .ci/build-mac.sh" build_sh: "arch -X86_64 .ci/build-mac.sh"
UPLOAD_COMMIT_HASH: 8e21bdbc40711a3fccd18fbf17b742348b0f4281 UPLOAD_COMMIT_HASH: 8e21bdbc40711a3fccd18fbf17b742348b0f4281
UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-mac" UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac
- name: Apple Silicon - name: Apple Silicon
build_sh: ".ci/build-mac-arm64.sh" build_sh: .ci/build-mac-arm64.sh
UPLOAD_COMMIT_HASH: 51ae32f468089a8169aaf1567de355ff4a3e0842 UPLOAD_COMMIT_HASH: 51ae32f468089a8169aaf1567de355ff4a3e0842
UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-mac-arm64" UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac-arm64
name: RPCS3 Mac ${{ matrix.name }} name: RPCS3 Mac ${{ matrix.name }}
runs-on: macos-14 runs-on: macos-14
env: env:
CCACHE_DIR: "/tmp/ccache_dir" CCACHE_DIR: /tmp/ccache_dir
CI_HAS_ARTIFACTS: true CI_HAS_ARTIFACTS: true
QT_VER: '6.7.3' QT_VER: '6.7.3'
QT_VER_MAIN: '6' QT_VER_MAIN: '6'
LLVM_COMPILER_VER: '19' LLVM_COMPILER_VER: '19'
RELEASE_MESSAGE: "../GitHubReleaseMessage.txt" RELEASE_MESSAGE: ../GitHubReleaseMessage.txt
UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }} UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }}
UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }} UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }}
steps: steps:
@ -144,25 +144,16 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-ccache-${{ matrix.name }}- ${{ runner.os }}-ccache-${{ matrix.name }}-
- name: Setup Homebrew Cache
uses: actions/cache@main
with:
path: "~/Library/Caches/Homebrew"
key: ${{ runner.os }}-homebrew-${{ matrix.name }}
restore-keys: |
${{ runner.os }}-homebrew-${{ matrix.name }}
- name: Setup Qt Cache - name: Setup Qt Cache
uses: actions/cache@main uses: actions/cache@main
with: with:
path: "/tmp/Qt" path: /tmp/Qt
key: ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }} key: ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
restore-keys: | restore-keys: |
${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }} ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
- name: Build - name: Build
run: | run: ${{ matrix.build_sh }}
${{ matrix.build_sh }}
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@main uses: actions/upload-artifact@main
@ -186,8 +177,7 @@ jobs:
github.ref == 'refs/heads/master' github.ref == 'refs/heads/master'
env: env:
RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }} RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
run: | run: .ci/github-upload.sh
.ci/github-upload.sh
Windows_Build: Windows_Build:
# Only run push event on master branch of main repo, but run all PRs # Only run push event on master branch of main repo, but run all PRs

3
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,3 @@
{
"editor.codeLens": false
}