Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

all: update to latest Zig version #32

Merged
merged 2 commits into from
Dec 31, 2024
Merged

all: update to latest Zig version #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1c1f5d
all: update Zig to version 0.14.0-dev.2577+271452d22
wrench-bot Dec 30, 2024
ec00e3f
update to latest zig version
Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup Zig
run: |
sudo apt install xz-utils
sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.14.0-dev.1911+3bf89f55c.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.14.0-dev.2577+271452d22.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
- name: x86_64-linux -> aarch64-macos
run: zig build -Dtarget=aarch64-macos
# TODO: re-enable this, unsure why it is failing during cross-compilation:
Expand All @@ -25,10 +25,10 @@ jobs:
# - name: Setup Zig
# run: |
# $ProgressPreference = 'SilentlyContinue'
# Invoke-WebRequest -Uri "https://pkg.machengine.org/zig/zig-windows-x86_64-0.14.0-dev.1911+3bf89f55c.zip" -OutFile "C:\zig.zip"
# Invoke-WebRequest -Uri "https://pkg.machengine.org/zig/zig-windows-x86_64-0.14.0-dev.2577+271452d22.zip" -OutFile "C:\zig.zip"
# cd C:\
# 7z x zig.zip
# Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.14.0-dev.1911+3bf89f55c\"
# Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.14.0-dev.2577+271452d22\"
# - name: x86_64-windows -> aarch64-macos
# run: zig build -Dtarget=aarch64-macos
x86_64-macos:
Expand All @@ -39,6 +39,6 @@ jobs:
- name: Setup Zig
run: |
brew install xz
sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-macos-x86_64-0.14.0-dev.1911+3bf89f55c.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-macos-x86_64-0.14.0-dev.2577+271452d22.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
- name: build
run: zig build
6 changes: 2 additions & 4 deletions generator.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,14 +480,12 @@ pub const Parser = struct {
const return_type = try self.allocator.create(Type);
return_type.* = .{ .void = {} };

const ty = .{
return self.parseTypeSuffix(.{
.function = .{
.return_type = return_type,
.params = std.ArrayList(Type).init(self.allocator),
},
};

return self.parseTypeSuffix(ty, is_const, true);
}, is_const, true);
},
.kw_instancetype => {
try self.match(.kw_instancetype);
Expand Down
Loading