Skip to content

Commit 88b0d7e

Browse files
committed
update build
1 parent b37c74b commit 88b0d7e

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ jobs:
1111
include:
1212
- { os: windows-latest, target: windows, platform: win32-x64}
1313
- { os: windows-latest, target: windows, platform: win32-x86, cmake_arch: "-A Win32"}
14-
<<<<<<< HEAD
1514
- { os: ubuntu-latest, target: linux, platform: linux-x64, zig_build: true}
16-
=======
17-
- { os: ubuntu-latest, target: linux, platform: linux-x64}
18-
- { os: ubuntu-latest, target: linux, platform: linux-x64-zig, zig_build: true}
19-
>>>>>>> 118a4b74e7d2e05faf11ef900f3d16397e50990f
2015
- { os: macos-latest, target: darwin, platform: darwin-x64}
2116
- { os: macos-latest, target: darwin, platform: darwin-arm64}
2217
steps:
@@ -50,8 +45,8 @@ jobs:
5045
if [[ "${{ matrix.zig_build }}" == "true" ]]; then
5146
sudo snap install zig --classic --beta
5247
mkdir -p build
53-
# 使用Zig作为工具链编译C++项目
54-
cmake -B build -G Ninja -DCMAKE_C_COMPILER=zig -DCMAKE_C_COMPILER_ARG1=cc -DCMAKE_CXX_COMPILER=zig -DCMAKE_CXX_COMPILER_ARG1=c++ -DCMAKE_BUILD_TYPE=Release -DEMMY_CORE_VERSION=${{env.TAG}}
48+
# 使用zig-build.cmake配置文件编译C++项目
49+
cmake -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/zig-build.cmake -DCMAKE_BUILD_TYPE=Release -DEMMY_CORE_VERSION=${{env.TAG}}
5550
cmake --build build --config Release
5651
cmake --install build --config Release --prefix ${{ github.workspace }}/artifact/
5752
else
@@ -145,4 +140,4 @@ jobs:
145140
darwin-arm64/darwin-arm64.zip
146141
darwin-x64/darwin-x64.zip
147142
linux-x64/linux-x64.zip
148-
token: ${{ secrets.RELEASE }}
143+
token: ${{ secrets.RELEASE }}

0 commit comments

Comments
 (0)