diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9aba9b3..032ebd5 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - uses: elerch/setup-zig@v3 with: - version: 0.12.0 + version: 0.13.0 - uses: elerch/zig-action-cache@v1.1.6 - name: Standard build run: zig build --verbose diff --git a/.gitignore b/.gitignore index 79dfea1..6c3169a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ access_keys.csv *.sqlite3 shared-local-instance.db *.json +.zig-cache/ diff --git a/build.zig b/build.zig index 7cc2f39..2600731 100644 --- a/build.zig +++ b/build.zig @@ -62,7 +62,7 @@ pub fn build(b: *std.Build) !void { .name = "ddblocal", // In this case the main source file is merely a path, however, in more // complicated build scripts, this could be a generated file. - .root_source_file = .{ .path = "src/main.zig" }, + .root_source_file = b.path("src/main.zig"), .target = target, .optimize = optimize, }); @@ -116,7 +116,7 @@ pub fn build(b: *std.Build) !void { const exe_sqlite_module = exe_sqlite_dep.module("sqlite"); exe.root_module.addImport("aws-signing", exe_aws_signing_module); exe.root_module.addImport("sqlite", exe_sqlite_module); - exe.addIncludePath(.{ .path = "c" }); + // exe.addIncludePath(.{ .path = "c" }); exe.linkLibrary(exe_sqlite_dep.artifact("sqlite")); // Similar to creating the run step earlier, this exposes a `test` step to // the `zig build --help` menu, providing a way for the user to request @@ -138,7 +138,7 @@ pub fn build(b: *std.Build) !void { // Creates a step for unit testing. This only builds the test executable // but does not run it. const unit_tests = b.addTest(.{ - .root_source_file = .{ .path = "src/main.zig" }, + .root_source_file = b.path("src/main.zig"), .target = t, .optimize = optimize, }); @@ -151,7 +151,7 @@ pub fn build(b: *std.Build) !void { unit_tests.root_module.addImport("aws-signing", aws_signing_module); unit_tests.root_module.addImport("sqlite", sqlite_module); - unit_tests.addIncludePath(.{ .path = "c" }); + // unit_tests.addIncludePath(b.path ("c" )); unit_tests.linkLibrary(sqlite_dep.artifact("sqlite")); } @@ -159,7 +159,7 @@ pub fn build(b: *std.Build) !void { creds_step.makeFn = generateCredentials; } -fn generateCredentials(s: *std.Build.Step, prog_node: *std.Progress.Node) error{ MakeFailed, MakeSkipped }!void { +fn generateCredentials(s: *std.Build.Step, prog_node: std.Progress.Node) error{ MakeFailed, MakeSkipped }!void { _ = s; // Account id: // Documentation describes account id as a 12 digit number: diff --git a/build.zig.zon b/build.zig.zon index 3636966..4ea2d97 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -4,16 +4,16 @@ .dependencies = .{ .sqlite = .{ - .url = "https://github.com/vrischmann/zig-sqlite/archive/fd17eb9a4ea35f515cc7c2e4755a3a5e284a0bd3.tar.gz", - .hash = "1220e0300613f2b949a8328c5b1d9ba84777f2258c1535039afcb536e9e1228d2881", + .url = "https://github.com/vrischmann/zig-sqlite/archive/91e5fedd15c5ea3cb42ccceefb3d0f4bb9bad68f.tar.gz", + .hash = "1220ba277845cb3cece7a7a1f929b920c97e9085bb644471c5dc8c72571f1485c75f", }, .@"universal-lambda-zig" = .{ - .url = "https://git.lerch.org/lobo/universal-lambda-zig/archive/f3d80b4afe8c13031b6cff051e93deaeadb1d268.tar.gz", - .hash = "122093d59b28dcd0201eaa1587ca78e11c06fb563b2cb9b554aaa5f7bab0ae34432e", + .url = "https://git.lerch.org/lobo/universal-lambda-zig/archive/562fd85dfbc3f7c056ca5a6e1d2c07863fbbf304.tar.gz", + .hash = "1220a3807d02bbefa12977795e0a2c27849c77b8ec4d866803692fd311ca49bdef36", }, .aws = .{ - .url = "https://git.lerch.org/api/packages/lobo/generic/aws-sdk-with-models/c60c40f627983b35cc4ba762f510d729c80b47c3/c60c40f627983b35cc4ba762f510d729c80b47c3-with-models.tar.gz", - .hash = "12208171bfd8fccdb28beab1978cf63b8557c9d210afb15ee59960342fd6b5476640", + .url = "https://git.lerch.org/api/packages/lobo/generic/aws-sdk-with-models/61592f039dce27c1723422862cc93f9095ed34ce/61592f039dce27c1723422862cc93f9095ed34ce-with-models.tar.gz", + .hash = "1220de091b7c5a26944eebca195ca57a0128fa3903ec6e01c9ad2db877dceb2f0674", }, }, .paths = .{