diff options
author | 2023-08-08 22:27:18 -0700 | |
---|---|---|
committer | 2023-08-08 22:27:18 -0700 | |
commit | 450b066cb812ebb69da111de6dd7aa00774266b4 (patch) | |
tree | 351ace4d85d849953c0b70bfca2b1510f15c32de /src/__global.zig | |
parent | 63f58f40267856ef5e8ff3e8b0c5720a6d870873 (diff) | |
download | bun-450b066cb812ebb69da111de6dd7aa00774266b4.tar.gz bun-450b066cb812ebb69da111de6dd7aa00774266b4.tar.zst bun-450b066cb812ebb69da111de6dd7aa00774266b4.zip |
Fix one of the astro segfaults, also fix bun init version (#4079)
* 4->16
* add assertions
* fix version stuff
Diffstat (limited to 'src/__global.zig')
-rw-r--r-- | src/__global.zig | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/__global.zig b/src/__global.zig index 7bcdaeeda..9a33fff37 100644 --- a/src/__global.zig +++ b/src/__global.zig @@ -7,20 +7,26 @@ const StringTypes = @import("./string_types.zig"); const Mimalloc = @import("root").bun.Mimalloc; const bun = @import("root").bun; -const BASE_VERSION = "0.7"; - pub const build_id = std.fmt.parseInt(u64, std.mem.trim(u8, @embedFile("./build-id"), "\n \r\t"), 10) catch unreachable; +pub const version: @import("./install/semver.zig").Version = .{ + .major = 0, + .minor = 7, + .patch = build_id, +}; + +const version_string = std.fmt.comptimePrint("{d}.{d}.{d}", .{ version.major, version.minor, version.patch }); + pub const package_json_version = if (Environment.isDebug) - std.fmt.comptimePrint(BASE_VERSION ++ ".{d}_debug", .{build_id}) + version_string ++ "_debug" else - std.fmt.comptimePrint(BASE_VERSION ++ ".{d}", .{build_id}); + version_string; pub const package_json_version_with_sha = if (Environment.git_sha.len == 0) package_json_version else if (Environment.isDebug) - std.fmt.comptimePrint(BASE_VERSION ++ ".{d}_debug ({s})", .{ build_id, Environment.git_sha[0..@min(Environment.git_sha.len, 8)] }) + std.fmt.comptimePrint("{s}_debug ({s})", .{ version_string, Environment.git_sha[0..@min(Environment.git_sha.len, 8)] }) else - std.fmt.comptimePrint(BASE_VERSION ++ ".{d} ({s})", .{ build_id, Environment.git_sha[0..@min(Environment.git_sha.len, 8)] }); + std.fmt.comptimePrint("{s} ({s})", .{ version_string, Environment.git_sha[0..@min(Environment.git_sha.len, 8)] }); pub const os_name = if (Environment.isWindows) "win32" @@ -47,12 +53,6 @@ pub inline fn getStartTime() i128 { return @import("root").bun.start_time; } -pub const version: @import("./install/semver.zig").Version = .{ - .major = 0, - .minor = 6, - .patch = build_id, -}; - pub fn setThreadName(name: StringTypes.stringZ) void { if (Environment.isLinux) { _ = std.os.prctl(.SET_NAME, .{@intFromPtr(name.ptr)}) catch 0; |