This commit is contained in:
parent
7505d87bf1
commit
2793e1e17b
|
@ -84,6 +84,9 @@ fn getGitVersion(allocator: std.mem.Allocator, git_working_root: ?[]const u8, en
|
||||||
// 2022-01-12 12:21:28 -0800
|
// 2022-01-12 12:21:28 -0800
|
||||||
// HEAD -> zig-native
|
// HEAD -> zig-native
|
||||||
|
|
||||||
|
if (std.os.getenv("DRONE_COMMIT_SHA") != null)
|
||||||
|
return getGitVersionFromDrone(allocator);
|
||||||
|
|
||||||
const log_output = try run(
|
const log_output = try run(
|
||||||
allocator,
|
allocator,
|
||||||
&[_][]const u8{
|
&[_][]const u8{
|
||||||
|
@ -126,6 +129,18 @@ fn getGitVersion(allocator: std.mem.Allocator, git_working_root: ?[]const u8, en
|
||||||
}
|
}
|
||||||
break :blk "";
|
break :blk "";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
return GitVersion{
|
||||||
|
.hash = hash,
|
||||||
|
.abbreviated_hash = abbrev_hash,
|
||||||
|
.commit_date = date,
|
||||||
|
.branch = branch,
|
||||||
|
.allocator = allocator,
|
||||||
|
.dirty = dirty,
|
||||||
|
.pretty_version = try prettyVersion(allocator, abbrev_hash, date, dirty_str),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
fn prettyVersion(allocator: std.mem.Allocator, abbrev_hash: []const u8, date: []const u8, dirty_str: []const u8) ![]const u8 {
|
||||||
const pretty_version: []const u8 = try std.fmt.allocPrint(
|
const pretty_version: []const u8 = try std.fmt.allocPrint(
|
||||||
allocator,
|
allocator,
|
||||||
"version {s}, committed at {s}{s}",
|
"version {s}, committed at {s}{s}",
|
||||||
|
@ -135,15 +150,20 @@ fn getGitVersion(allocator: std.mem.Allocator, git_working_root: ?[]const u8, en
|
||||||
dirty_str,
|
dirty_str,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
return pretty_version;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn getGitVersionFromDrone(allocator: std.mem.Allocator) !GitVersion {
|
||||||
|
const abbrev_hash = std.os.getenv("DRONE_COMMIT_SHA").?[0..7]; // This isn't quite how git works, but ok
|
||||||
|
const date = std.os.getenv("DRONE_BUILD_STARTED").?; // this is a timestamp :(
|
||||||
return GitVersion{
|
return GitVersion{
|
||||||
.hash = hash,
|
.hash = std.os.getenv("DRONE_COMMIT_SHA").?,
|
||||||
.abbreviated_hash = abbrev_hash,
|
.abbreviated_hash = abbrev_hash,
|
||||||
.commit_date = date,
|
.commit_date = date,
|
||||||
.branch = branch,
|
.branch = std.os.getenv("DRONE_COMMIT_BRANCH").?,
|
||||||
.allocator = allocator,
|
.allocator = allocator,
|
||||||
.dirty = dirty,
|
.dirty = false,
|
||||||
.pretty_version = pretty_version,
|
.pretty_version = try prettyVersion(allocator, abbrev_hash, date, ""),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
fn getLines(allocator: std.mem.Allocator, comptime line_count: u32, data: []const u8) ![line_count][]u8 {
|
fn getLines(allocator: std.mem.Allocator, comptime line_count: u32, data: []const u8) ![line_count][]u8 {
|
||||||
|
|
|
@ -184,10 +184,6 @@ fn addHeaders(allocator: std.mem.Allocator, z_headers: *zfetch.Headers, host: []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fullCast(comptime T: type, val: anytype) T {
|
|
||||||
return @ptrCast(T, @alignCast(@alignOf(T), val));
|
|
||||||
}
|
|
||||||
|
|
||||||
fn regionSubDomain(allocator: std.mem.Allocator, service: []const u8, region: []const u8, useDualStack: bool) !EndPoint {
|
fn regionSubDomain(allocator: std.mem.Allocator, service: []const u8, region: []const u8, useDualStack: bool) !EndPoint {
|
||||||
const environment_override = std.os.getenv("AWS_ENDPOINT_URL");
|
const environment_override = std.os.getenv("AWS_ENDPOINT_URL");
|
||||||
if (environment_override) |override| {
|
if (environment_override) |override| {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user