mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 04:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove 'g' prefix from commit hash in Zig semver"

Browse Source 
This reverts commit 02438aabe3a04ac8ca2a2e0b2501ba18885652e3.
This commit is contained in:
Andrew Kelley 2020-12-31 16:41:24 -07:00
parent fbf269cc47
commit 9afe5859a3
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -46,7 +46,7 @@ if("${ZIG_VERSION}" STREQUAL "")
if(NOT GIT_TAG VERSION_EQUAL ZIG_VERSION)
message(SEND_ERROR "Zig version (${ZIG_VERSION}) does not match Git tag (${GIT_TAG}).")
endif()
elseif(GIT_DESCRIBE MATCHES "^v?([0-9]+\\.[0-9]+\\.[0-9]+)-([0-9]+)-g(.+)$")
elseif(GIT_DESCRIBE MATCHES "^v?([0-9]+\\.[0-9]+\\.[0-9]+)-([0-9]+)-(.+)$")
# Untagged pre-release. The Zig version is updated to include the number of commits
# since the last tagged version and the commit hash. The version is formatted in
# accordance with the https://semver.org specification.

10
build.zig
View File

@ -256,17 +256,11 @@ pub fn build(b: *Builder) !void {
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: {}\n", .{git_describe});
break :v version_string;
}
// The version is reformatted in accordance with the https://semver.org specification.
break :v b.fmt("{}-dev.{}+{}", .{ version_string, commit_height, commit_id[1..] });
break :v b.fmt("{}-dev.{}+{}", .{ version_string, commit_height, commit_id });
},
else => {
std.debug.print("Unexpected `git describe` output: {}\n", .{git_describe});
std.debug.print("Failed to parse `git describe` output: {}\n", .{git_describe});
break :v version_string;
},
}