Skip to content

Commit

Permalink
Merge pull request #18 from fyne-io/bugs/linux-golang-1.20
Browse files Browse the repository at this point in the history
Address build issue on linux with go 1.20 and zig by switching to latest zig
  • Loading branch information
Bluebugs authored Apr 28, 2023
2 parents 41b1653 + ecd656e commit 4f13507
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: all base android darwin darwin-sdk-extractor freebsd linux windows web

# VERSION is the Fyne Cross Images version
VERSION := "1.1.0"
VERSION := "1.1.1"
# REPOSITORY is the docker repository
REPOSITORY := docker.io/fyneio/fyne-cross-images
# RUNNER is the CLI used to interact with docker or podman
Expand Down
6 changes: 3 additions & 3 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM debian:bullseye-slim AS base
ENV GO_VERSION=1.20.3
# dev version of Zig to support windows-386 target
# see: https://github.com/ziglang/zig/pull/13569
ENV ZIG_VERSION=0.11.0-dev.632+d69e97ae1
ENV ZIG_VERSION=0.11.0-dev.2834+13101295b
ENV FYNE_VERSION=v2.3.3
ENV FIXUID_VERSION=0.5.1

Expand Down Expand Up @@ -66,14 +66,14 @@ RUN set -eux; \
url="https://ziglang.org/builds/zig-linux-x86_64-${ZIG_VERSION}.tar.xz";\
# stable release
# url="https://ziglang.org/download/${ZIG_VERSION}/zig-linux-x86_64-${ZIG_VERSION}.tar.xz";\
sha256='11508dca9a4654719f337bb43d6b226cc3f17f5888cb3f277436c7944f9bcd0b'; \
sha256='cd73a3f3dc5e121712c9f8de7988e725b988516f3b50cfd3354033cec87b4c70'; \
;; \
'arm64') \
# dev release
url="https://ziglang.org/builds/zig-linux-aarch64-${ZIG_VERSION}.tar.xz";\
# stable release
# url="https://ziglang.org/download/${ZIG_VERSION}/zig-linux-aarch64-${ZIG_VERSION}.tar.xz";\
sha256='eea60804bb6ec17a21aed9d2e507c37e922ef285ce0142e3ef1002fcb89133a2'; \
sha256='0f5d907f263ea2dc41c6417f089777f05dc25bfb5011023487931141138e34e6'; \
;; \
*) echo >&2 "error: unsupported architecture '$arch'"; exit 1 ;; \
esac; \
Expand Down

0 comments on commit 4f13507

Please sign in to comment.