Skip to content

Commit

Permalink
Merge pull request #53 from kivikakk/use-source-libpcre
Browse files Browse the repository at this point in the history
Use source libpcre build.
  • Loading branch information
kivikakk authored Jul 1, 2024
2 parents 57d8128 + 6ee59c7 commit 26b3876
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
21 changes: 12 additions & 9 deletions .github/workflows/zig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ jobs:
test-linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/checkout@v4
- uses: goto-bus-stop/setup-zig@v2
with:
version: 0.12.0
Expand All @@ -19,21 +17,26 @@ jobs:
test-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/checkout@v4
- uses: goto-bus-stop/setup-zig@2a9625d550eefc3a9b1a43d342ad655f563f8241
with:
version: 0.12.0
- run: brew install pcre
- run: zig build
- run: zig build test
test-windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: goto-bus-stop/setup-zig@v2
with:
version: 0.12.0
- run: zig build
- run: zig build test
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/checkout@v4
- uses: goto-bus-stop/setup-zig@v2
with:
version: 0.12.0
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/.zig-cache
/zig-cache
/zig-out
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Zig port of [Comrak](https://github.com/kivikakk/comrak). Maintains 100% spec-c
$ zig fetch --save https://github.com/kivikakk/koino/archive/<commit hash>.tar.gz
```
* [Follow the `libpcre.zig` dependency install instructions](https://github.com/kivikakk/libpcre.zig/blob/main/README.md) for your operating system.
* Add the following to your `build.zig`'s `build` function:
```zig
const koino_pkg = b.dependency("koino", .{ .optimize = optimize, .target = target });
Expand Down
4 changes: 2 additions & 2 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
.minimum_zig_version = "0.12.0",
.dependencies = .{
.@"libpcre.zig" = .{
.url = "https://github.com/kivikakk/libpcre.zig/archive/9522ad9bcce76ce608ac62097450d4eac7436d9c.tar.gz",
.hash = "1220fa274f41744bc60b284f9264705f772b98afd2ed219cebb6cec744422e8e2692",
.url = "https://github.com/kivikakk/libpcre.zig/archive/0f3e120c75c297f7d88a5c698d941a9e730a2059.tar.gz",
.hash = "12208c8c5b46df969207ca1458b95ebbe988892d1f0e028d1fb95bd58cf55bca6628",
},
.@"htmlentities.zig" = .{
.url = "https://github.com/kivikakk/htmlentities.zig/archive/6c6ab63c9fce8317049d332377db760a2c8932e7.tar.gz",
Expand Down

0 comments on commit 26b3876

Please sign in to comment.