Skip to content

Commit

Permalink
remove -zig suffix from app since it doesnt conflict with go one
Browse files Browse the repository at this point in the history
  • Loading branch information
nektro committed Jan 23, 2022
1 parent e3d9faa commit dad860b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN zig build -Dversion=r${RELEASE_NUM} -Drelease

FROM alpine
COPY --from=golang /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=golang /app/zig-out/bin/aquila-zig /app/aquila
COPY --from=golang /app/zig-out/bin/aquila /app/aquila
RUN apk add git

VOLUME /data
Expand Down
2 changes: 1 addition & 1 deletion build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub fn build(b: *std.build.Builder) void {

const use_full_name = b.option(bool, "use-full-name", "") orelse false;
const with_os_arch = b.fmt("-{s}-{s}", .{ @tagName(target.os_tag orelse builtin.os.tag), @tagName(target.cpu_arch orelse builtin.cpu.arch) });
const exe_name = b.fmt("{s}{s}", .{ "aquila-zig", if (use_full_name) with_os_arch else "" });
const exe_name = b.fmt("{s}{s}", .{ "aquila", if (use_full_name) with_os_arch else "" });

const exe = b.addExecutable(exe_name, "src/main.zig");
exe.setTarget(target);
Expand Down

0 comments on commit dad860b

Please sign in to comment.