feat: add version info and upload built artifacts
/ build-x86_64-linux-gnu (push) Failing after 1m3s
Details
/ build-x86_64-linux-gnu (push) Failing after 1m3s
Details
parent
7e434c2bc2
commit
20c6c18079
|
@ -1,6 +1,6 @@
|
||||||
on: [push]
|
on: [push]
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
build-x86_64-linux-gnu:
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Zig
|
- name: Setup Zig
|
||||||
|
@ -9,4 +9,8 @@ jobs:
|
||||||
version: 0.12.0
|
version: 0.12.0
|
||||||
cache: false
|
cache: false
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- run: zig build
|
- run: zig build install --summary all -Dtarget=x86_64-linux-gnu -Doptimize=ReleaseSmall
|
||||||
|
- uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: seizer-solitaire
|
||||||
|
path: zig-out/bin/seizer-solitaire
|
||||||
|
|
72
build.zig
72
build.zig
|
@ -1,9 +1,12 @@
|
||||||
const std = @import("std");
|
const std = @import("std");
|
||||||
|
const mem = std.mem;
|
||||||
|
|
||||||
|
const seizer_solitaire_version = std.SemanticVersion{ .major = 0, .minor = 1, .patch = 0 };
|
||||||
|
|
||||||
// Although this function looks imperative, note that its job is to
|
// Although this function looks imperative, note that its job is to
|
||||||
// declaratively construct a build graph that will be executed by an external
|
// declaratively construct a build graph that will be executed by an external
|
||||||
// runner.
|
// runner.
|
||||||
pub fn build(b: *std.Build) void {
|
pub fn build(b: *std.Build) !void {
|
||||||
// Standard target options allows the person running `zig build` to choose
|
// Standard target options allows the person running `zig build` to choose
|
||||||
// what target to build for. Here we do not override the defaults, which
|
// what target to build for. Here we do not override the defaults, which
|
||||||
// means any target is allowed, and the default is native. Other options
|
// means any target is allowed, and the default is native. Other options
|
||||||
|
@ -66,4 +69,71 @@ pub fn build(b: *std.Build) void {
|
||||||
// running the unit tests.
|
// running the unit tests.
|
||||||
const test_step = b.step("test", "Run unit tests");
|
const test_step = b.step("test", "Run unit tests");
|
||||||
test_step.dependOn(&run_exe_unit_tests.step);
|
test_step.dependOn(&run_exe_unit_tests.step);
|
||||||
|
|
||||||
|
// code to add version to binary, stolen from the zig language's build.zig
|
||||||
|
const exe_options = b.addOptions();
|
||||||
|
exe.root_module.addOptions("build_options", exe_options);
|
||||||
|
|
||||||
|
const opt_version_string = b.option([]const u8, "version-string", "Override version string. Default is to find out with git.");
|
||||||
|
const version_slice = if (opt_version_string) |version| version else v: {
|
||||||
|
if (!std.process.can_spawn) {
|
||||||
|
std.debug.print("error: version info cannot be retrieved from git. Zig version must be provided using -Dversion-string\n", .{});
|
||||||
|
std.process.exit(1);
|
||||||
|
}
|
||||||
|
const version_string = b.fmt("{d}.{d}.{d}", .{ seizer_solitaire_version.major, seizer_solitaire_version.minor, seizer_solitaire_version.patch });
|
||||||
|
|
||||||
|
var code: u8 = undefined;
|
||||||
|
const git_describe_untrimmed = b.runAllowFail(&[_][]const u8{
|
||||||
|
"git",
|
||||||
|
"-C",
|
||||||
|
b.build_root.path orelse ".",
|
||||||
|
"describe",
|
||||||
|
"--match",
|
||||||
|
"*.*.*",
|
||||||
|
"--tags",
|
||||||
|
"--abbrev=9",
|
||||||
|
}, &code, .Ignore) catch {
|
||||||
|
break :v version_string;
|
||||||
|
};
|
||||||
|
const git_describe = mem.trim(u8, git_describe_untrimmed, " \n\r");
|
||||||
|
|
||||||
|
switch (mem.count(u8, git_describe, "-")) {
|
||||||
|
0 => {
|
||||||
|
// Tagged release version (e.g. 0.10.0).
|
||||||
|
if (!mem.eql(u8, git_describe, version_string)) {
|
||||||
|
std.debug.print("Zig version '{s}' does not match Git tag '{s}'\n", .{ version_string, git_describe });
|
||||||
|
std.process.exit(1);
|
||||||
|
}
|
||||||
|
break :v version_string;
|
||||||
|
},
|
||||||
|
2 => {
|
||||||
|
// Untagged development build (e.g. 0.10.0-dev.2025+ecf0050a9).
|
||||||
|
var it = mem.splitScalar(u8, git_describe, '-');
|
||||||
|
const tagged_ancestor = it.first();
|
||||||
|
const commit_height = it.next().?;
|
||||||
|
const commit_id = it.next().?;
|
||||||
|
|
||||||
|
const ancestor_ver = try std.SemanticVersion.parse(tagged_ancestor);
|
||||||
|
if (seizer_solitaire_version.order(ancestor_ver) != .gt) {
|
||||||
|
std.debug.print("version '{}' must be greater than tagged ancestor '{}'\n", .{ seizer_solitaire_version, ancestor_ver });
|
||||||
|
std.process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check that the commit hash is prefixed with a 'g' (a Git convention).
|
||||||
|
if (commit_id.len < 1 or commit_id[0] != 'g') {
|
||||||
|
std.debug.print("Unexpected `git describe` output: {s}\n", .{git_describe});
|
||||||
|
break :v version_string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The version is reformatted in accordance with the https://semver.org specification.
|
||||||
|
break :v b.fmt("{s}-dev.{s}+{s}", .{ version_string, commit_height, commit_id[1..] });
|
||||||
|
},
|
||||||
|
else => {
|
||||||
|
std.debug.print("Unexpected `git describe` output: {s}\n", .{git_describe});
|
||||||
|
break :v version_string;
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const version = try b.allocator.dupeZ(u8, version_slice);
|
||||||
|
exe_options.addOption([:0]const u8, "version", version);
|
||||||
}
|
}
|
||||||
|
|
11
src/main.zig
11
src/main.zig
|
@ -259,6 +259,16 @@ fn render(window: seizer.Window) !void {
|
||||||
@floor((canvas.window_size[1] - space_taken_by_board[1]) / 2),
|
@floor((canvas.window_size[1] - space_taken_by_board[1]) / 2),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_ = canvas.printText(
|
||||||
|
.{
|
||||||
|
0,
|
||||||
|
canvas.window_size[1],
|
||||||
|
},
|
||||||
|
"{s}",
|
||||||
|
.{build_options.version},
|
||||||
|
.{ .@"align" = .left, .baseline = .bottom, .scale = scalef },
|
||||||
|
);
|
||||||
|
|
||||||
if (win_count) |w| {
|
if (win_count) |w| {
|
||||||
_ = canvas.printText(
|
_ = canvas.printText(
|
||||||
.{
|
.{
|
||||||
|
@ -898,6 +908,7 @@ const Snapshot = struct {
|
||||||
const DeckSprites = assets.DeckSprites;
|
const DeckSprites = assets.DeckSprites;
|
||||||
const Card = assets.Card;
|
const Card = assets.Card;
|
||||||
|
|
||||||
|
const build_options = @import("build_options");
|
||||||
const assets = @import("./assets.zig");
|
const assets = @import("./assets.zig");
|
||||||
const builtin = @import("builtin");
|
const builtin = @import("builtin");
|
||||||
const seizer = @import("seizer");
|
const seizer = @import("seizer");
|
||||||
|
|
Loading…
Reference in New Issue