Skip to content

Commit 0f45c08

Browse files
schm1dtmacAniLeo
authored andcommitted
Suggested review changes
1 parent 55aaffb commit 0f45c08

File tree

4 files changed

+14
-23
lines changed

4 files changed

+14
-23
lines changed

.ci/build-mac-arm64.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ &&
7272
# 3rdparty fixes
7373
sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
7474

75-
rm -rf build
7675
mkdir build && cd build || exit 1
7776

7877
export MACOSX_DEPLOYMENT_TARGET=14.0

.ci/build-mac.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ &&
7575
# 3rdparty fixes
7676
sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
7777

78-
rm -rf build
7978
mkdir build && cd build || exit 1
8079

8180
export MACOSX_DEPLOYMENT_TARGET=14.0

.github/workflows/rpcs3.yml

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -114,20 +114,20 @@ jobs:
114114
- name: Intel
115115
build_sh: "arch -X86_64 .ci/build-mac.sh"
116116
UPLOAD_COMMIT_HASH: 8e21bdbc40711a3fccd18fbf17b742348b0f4281
117-
UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-mac"
117+
UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac
118118
- name: Apple Silicon
119-
build_sh: ".ci/build-mac-arm64.sh"
119+
build_sh: .ci/build-mac-arm64.sh
120120
UPLOAD_COMMIT_HASH: 51ae32f468089a8169aaf1567de355ff4a3e0842
121-
UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-mac-arm64"
121+
UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac-arm64
122122
name: RPCS3 Mac ${{ matrix.name }}
123123
runs-on: macos-14
124124
env:
125-
CCACHE_DIR: "/tmp/ccache_dir"
125+
CCACHE_DIR: /tmp/ccache_dir
126126
CI_HAS_ARTIFACTS: true
127127
QT_VER: '6.7.3'
128128
QT_VER_MAIN: '6'
129129
LLVM_COMPILER_VER: '19'
130-
RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
130+
RELEASE_MESSAGE: ../GitHubReleaseMessage.txt
131131
UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }}
132132
UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }}
133133
steps:
@@ -141,28 +141,19 @@ jobs:
141141
with:
142142
path: ${{ env.CCACHE_DIR }}
143143
key: ${{ runner.os }}-ccache-${{ matrix.name }}-${{github.run_id}}
144-
restore-keys: |
144+
restore-keys: |
145145
${{ runner.os }}-ccache-${{ matrix.name }}-
146146
147-
- name: Setup Homebrew Cache
148-
uses: actions/cache@main
149-
with:
150-
path: "~/Library/Caches/Homebrew"
151-
key: ${{ runner.os }}-homebrew-${{ matrix.name }}
152-
restore-keys: |
153-
${{ runner.os }}-homebrew-${{ matrix.name }}
154-
155147
- name: Setup Qt Cache
156148
uses: actions/cache@main
157149
with:
158-
path: "/tmp/Qt"
150+
path: /tmp/Qt
159151
key: ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
160-
restore-keys: |
152+
restore-keys: |
161153
${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
162154
163155
- name: Build
164-
run: |
165-
${{ matrix.build_sh }}
156+
run: ${{ matrix.build_sh }}
166157

167158
- name: Upload artifacts
168159
uses: actions/upload-artifact@main
@@ -183,11 +174,10 @@ jobs:
183174
if: |
184175
github.event_name != 'pull_request' &&
185176
github.repository == 'RPCS3/rpcs3' &&
186-
github.ref == 'refs/heads/master'
177+
github.ref == 'refs/heads/master'
187178
env:
188179
RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
189-
run: |
190-
.ci/github-upload.sh
180+
run: .ci/github-upload.sh
191181

192182
Windows_Build:
193183
# Only run push event on master branch of main repo, but run all PRs

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"editor.codeLens": false
3+
}

0 commit comments

Comments
 (0)