fix release assets

Author: jeffective

.github/workflows/main.yml

@@ -43,11 +43,10 @@ jobs:
           GATORCAT_RELEASE: 1
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Add binaries to release
+      - name: Add binaries to release assets
         uses: softprops/action-gh-release@v2
         if: ${{ github.event_name == 'release' }}
         with:
+          fail_on_unmatched_files: true
           files: |
-              zig-out/x86_64-linux-musl/
-              zig-out/aarch64-linux-musl/
-              zig-out/x86_64-windows-gnu/
+              zig-out/release/*

build.zig

@@ -1,6 +1,8 @@
 const std = @import("std");
 const builtin = @import("builtin");
 
+const build_zig_zon = @embedFile("build.zig.zon");
+
 pub fn build(b: *std.Build) void {
     // const git_describe = std.mem.trimRight(u8, b.run(&.{ "git", "describe", "--tags" }), '\n');
 
@@ -49,7 +51,7 @@ pub fn build(b: *std.Build) void {
     }
 
     // zig build
-    _ = buildCli(b, step_cli, target, optimize, module, .default);
+    _ = buildCli(b, step_cli, target, optimize, module, .default, "gatorcat");
 
     // zig build release
     const installs = buildRelease(b, step_release) catch @panic("oom");
@@ -185,6 +187,7 @@ pub fn buildCli(
     optimize: std.builtin.OptimizeMode,
     gatorcat_module: *std.Build.Module,
     dest_dir: std.Build.Step.InstallArtifact.Options.Dir,
+    exe_name: []const u8,
 ) *std.Build.Step.InstallArtifact {
     const flags_module = b.dependency("flags", .{
         .target = target,
@@ -199,7 +202,7 @@ pub fn buildCli(
         .optimize = optimize,
     }).module("zenoh");
     const cli = b.addExecutable(.{
-        .name = "gatorcat",
+        .name = exe_name,
         .root_source_file = b.path("src/cli/main.zig"),
         .target = target,
         .optimize = optimize,
@@ -253,14 +256,38 @@ pub fn buildRelease(
             },
             else => {},
         }
-        try installs.append(buildCli(
-            b,
-            step,
-            options.target,
-            options.optimize,
-            gatorcat_module,
-            .{ .override = .{ .custom = target.zigTriple(b.allocator) catch @panic("oom") } },
-        ));
+        const triple = target.zigTriple(b.allocator) catch @panic("oom");
+        try installs.append(
+            buildCli(
+                b,
+                step,
+                options.target,
+                options.optimize,
+                gatorcat_module,
+                .{ .override = .{ .custom = "release" } },
+                try std.fmt.allocPrint(b.allocator, "gatorcat-{}-{s}", .{ getVersionFromZon(), triple }),
+            ),
+        );
     }
     return installs;
 }
+
+fn getVersionFromZon() std.SemanticVersion {
+    var buffer: [10 * build_zig_zon.len]u8 = undefined;
+    var fba = std.heap.FixedBufferAllocator.init(&buffer);
+    const version = std.zon.parse.fromSlice(
+        struct { version: []const u8 },
+        fba.allocator(),
+        build_zig_zon,
+        null,
+        .{ .ignore_unknown_fields = true },
+    ) catch @panic("Invalid build.zig.zon!");
+    const semantic_version = std.SemanticVersion.parse(version.version) catch @panic("Invalid version!");
+    return std.SemanticVersion{
+        .major = semantic_version.major,
+        .minor = semantic_version.minor,
+        .patch = semantic_version.patch,
+        .build = null, // dont return pointers to stack memory
+        .pre = null, // dont return pointers to stack memory
+    };
+}

build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = .gatorcat,
-    .version = "0.3.1",
+    .version = "0.3.2",
     .fingerprint = 0xb9356c7c4de9ca59, // Changing this has security and trust implications.
     .minimum_zig_version = "0.14.0",
     .dependencies = .{

src/ci/release_docker.zig

@@ -117,16 +117,18 @@ pub fn main() !void {
     const version_str_nl = try std.fmt.allocPrint(allocator, "{s}\n", .{version_str});
     const tag = try std.fmt.allocPrint(allocator, "ghcr.io/kj4tmp/gatorcat:{s}", .{version_str});
 
-    const dockerfile =
+    const dockerfile_fmt =
         \\FROM scratch AS build-amd64
-        \\COPY zig-out/x86_64-linux-musl/gatorcat gatorcat
+        \\COPY zig-out/release/gatorcat-{}-x86_64-linux-musl gatorcat
         \\FROM scratch AS build-arm64
-        \\COPY zig-out/aarch64-linux-musl/gatorcat gatorcat
+        \\COPY zig-out/release/gatorcat-{}-aarch64-linux-musl gatorcat
         \\ARG TARGETARCH
-        \\FROM build-${TARGETARCH}
+        \\FROM build-${{TARGETARCH}}
         \\ENTRYPOINT ["/gatorcat"]
     ;
 
+    const dockerfile = try std.fmt.allocPrint(allocator, dockerfile_fmt, .{ getVersionFromZon(), getVersionFromZon() });
+
     const docker_build_arm64 = try runWithStdin(.{
         .allocator = allocator,
         .argv = &.{