diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml index 73e5366..3b30e1f 100644 --- a/.forgejo/workflows/test.yaml +++ b/.forgejo/workflows/test.yaml @@ -31,10 +31,7 @@ jobs: # dependency of zig-http's build. It fetches what it needs here and # nowhere else. # - # Skipped while zig-dns-client is still on Zig 0.16.0: the project - # cannot build until it moves to 0.17.0 and the pin there follows. - name: Test HTTPS records against zig-dns-client - if: false run: nix develop -c sh -c 'cd interop/https-records && zig build test --summary all' # Nothing else builds the fuzz driver or the documentation server, so diff --git a/doc/client.md b/doc/client.md index c3ee54c..e17b1b3 100644 --- a/doc/client.md +++ b/doc/client.md @@ -166,11 +166,6 @@ $ cd interop/https-records $ nix develop ../.. -c zig build test --summary all ``` -It does not build at the moment. zig-http requires Zig 0.17.0 and -zig-dns-client is still on 0.16.0, so the two cannot meet in one build until -zig-dns-client moves too and this project's pin follows it; CI skips the step -until then. - **A body too large to hold** goes in `payload_reader` rather than `payload`: a reader and a length. The length is declared as the `Content-Length`, and exactly that many octets are then read from the reader diff --git a/interop/https-records/build.zig.zon b/interop/https-records/build.zig.zon index 001bc2b..2b430c1 100644 --- a/interop/https-records/build.zig.zon +++ b/interop/https-records/build.zig.zon @@ -5,7 +5,7 @@ .name = .https_records_interop, .version = "0.0.0", .fingerprint = 0x12fd141a6d0da96e, - .minimum_zig_version = "0.16.0", + .minimum_zig_version = "0.17.0", .dependencies = .{ // zig-http, as it is in this checkout: the thing under test. .http = .{ .path = "../.." }, @@ -14,14 +14,14 @@ // zig-http in turn -- DNS over HTTPS -- at a pin of its own, which is // exactly why it is here and not in zig-http's build.zig.zon. .dns_client = .{ - .url = "git+https://git.jcollie.dev/jeff/zig-dns-client.git#ef4f807b314188d17de80cfe389822f4ee3b8dd1", - .hash = "dns_client-0.1.0-L4NvbmzfDwDTyDCVrpZSZzB0HjLLr7Tvtg8VsSO4OBKD", + .url = "git+https://git.jcollie.dev/jeff/zig-dns-client.git#97f15117a92250046aaa8a45cc0ec027103a0781", + .hash = "dns_client-0.2.0-L4Nvbt6eEQCl96l8P8n4bfVsx2YwQbe-2hnSuFCrUUvo", }, // Only for the test's DNS server, which builds answers with it. The same // commit zig-dns-client pins, so that there is one copy of it here. .dns = .{ - .url = "git+https://git.jcollie.dev/jeff/zig-dns.git#6027a64a3fbc84b146ac05306d0fa25f837fdcba", - .hash = "dns-0.1.0-vMrSfh8OBwDpnEuJqpxJOwv7ofpQKnDGfDjQfZ6VV6P7", + .url = "git+https://git.jcollie.dev/jeff/zig-dns.git#24d9e0c1a15685bd65dca1ec11a910c8ed159744", + .hash = "dns-0.2.0-vMrSfhUUBwCGM0_Bfa75WeuwPMH_UCsYwWx5J8BOIbU5", }, }, .paths = .{