Skip to content

Commit 7ea3306

Browse files
committed
yapb: update
1 parent 118d843 commit 7ea3306

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,23 @@ jobs:
144144
submodules: recursive
145145
- name: Install dependencies
146146
run: |
147-
brew update
148-
brew install cmake gcc ninja fontconfig
147+
arch -${{ matrix.arch }} /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
148+
if [ "${{ matrix.arch }}" == "arm64" ]; then
149+
arch -${{ matrix.arch }} brew install cmake gcc ninja fontconfig
150+
else
151+
arch -${{ matrix.arch }} /usr/local/bin/brew install cmake gcc ninja fontconfig
152+
fi
149153
- name: Configure
150154
run: cmake --preset "macos-ci-${{ matrix.arch }}"
151155
- name: Build and Package
152156
run: |
153-
cmake --build .
154-
cpack --config CPackConfig.cmake
157+
if [ "${{ matrix.arch }}" == "arm64" ]; then
158+
arch -${{ matrix.arch }} cmake --build .
159+
arch -${{ matrix.arch }} cpack --config CPackConfig.cmake
160+
else
161+
arch -${{ matrix.arch }} /usr/local/bin/cmake --build .
162+
arch -${{ matrix.arch }} /usr/local/bin/cpack --config CPackConfig.cmake
163+
fi
155164
working-directory: build
156165
- name: Upload artifacts
157166
uses: actions/upload-artifact@v4

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ elseif(VITA)
136136
set(CPACK_PACKAGE_FILE_NAME "CS16Client-PSVita")
137137
elseif(APPLE)
138138
set(CPACK_GENERATOR "ZIP")
139-
set(CPACK_PACKAGE_FILE_NAME "CS16Client-macOS-${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
139+
set(CPACK_PACKAGE_FILE_NAME "CS16Client-macOS-${CMAKE_SYSTEM_PROCESSOR}")
140140
else()
141141
set(CPACK_GENERATOR "TGZ")
142142
set(CPACK_PACKAGE_FILE_NAME "CS16Client-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")

0 commit comments

Comments
 (0)