ci: resolve ci build errors for the last time i promise

This commit is contained in:
Rekai Nyangadzayi Musuka 2024-03-06 17:59:08 -06:00
parent f71aaafe41
commit ef93bbe084
4 changed files with 6 additions and 9 deletions

View File

@ -41,14 +41,12 @@ jobs:
brew install sdl2 brew install sdl2
- name: build - name: build
run: zig build -Doptimize=ReleaseSafe -Dcpu=baseline run: zig build -Doptimize=ReleaseSafe -Dcpu=baseline
- name: prepare-executable
run: |
mv zig-out/lib/* zig-out/bin
- name: upload - name: upload
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: zba-${{matrix.os}} name: zba-${{matrix.os}}
path: zig-out/bin path: zig-out
lint: lint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

6
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "lib/SDL.zig"]
path = lib/SDL.zig
url = https://github.com/paoda/SDL.zig
[submodule "lib/zgui"] [submodule "lib/zgui"]
path = lib/zgui path = lib/zgui
url = https://git.musuka.dev/paoda/zgui url = https://git.musuka.dev/paoda/zgui
[submodule "lib/SDL.zig"]
path = lib/SDL.zig
url = https://github.com/paoda/SDL.zig

View File

@ -43,7 +43,6 @@ pub fn build(b: *std.Build) void {
exe.root_module.addImport("sdl2", sdk.getNativeModule()); exe.root_module.addImport("sdl2", sdk.getNativeModule());
// https://git.musuka.dev/paoda/zgui // https://git.musuka.dev/paoda/zgui
// .shared option should stay in sync with SDL.zig call above where true == .dynamic, and false == .static
const zgui_pkg = zgui.package(b, target, optimize, .{ .options = .{ .backend = .sdl2_opengl3 } }); const zgui_pkg = zgui.package(b, target, optimize, .{ .options = .{ .backend = .sdl2_opengl3 } });
zgui_pkg.link(exe); zgui_pkg.link(exe);
sdk.link(zgui_pkg.zgui_c_cpp, .dynamic); sdk.link(zgui_pkg.zgui_c_cpp, .dynamic);

@ -1 +1 @@
Subproject commit 6d42434c4d92efb1199d58f821edb7f701812f7e Subproject commit cd902129b7ab571693892c72bbf4e2fb58658730