From 2f2a92e4bdb3cc255d4f5fcae7deb72a13dbbf43 Mon Sep 17 00:00:00 2001 From: Felicitas Pojtinger Date: Sun, 26 Dec 2021 16:49:32 +0100 Subject: [PATCH] build: Disable 32-bit Windows due to crashing Go compiler --- .github/workflows/hydrun.yaml | 12 ++++++------ Hydrunfile | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/hydrun.yaml b/.github/workflows/hydrun.yaml index c8b80a4..b5ce68b 100644 --- a/.github/workflows/hydrun.yaml +++ b/.github/workflows/hydrun.yaml @@ -24,12 +24,12 @@ jobs: flags: -e '--privileged' cmd: ./Hydrunfile windows x86_64 dst: out/* - - id: stfs-windows-i686 - src: . - os: fedora:rawhide - flags: -e '--privileged' - cmd: ./Hydrunfile windows i686 - dst: out/* + # - id: stfs-windows-i686 + # src: . + # os: fedora:rawhide + # flags: -e '--privileged' + # cmd: ./Hydrunfile windows i686 + # dst: out/* steps: - name: Maximize build space diff --git a/Hydrunfile b/Hydrunfile index 353e85f..f7ebe5e 100755 --- a/Hydrunfile +++ b/Hydrunfile @@ -23,18 +23,18 @@ if [ "$1" = "windows" ]; then cp -rf . ~/.wine/drive_c/users/root/Documents/stfs mkdir -p ~/.wine/drive_c/users/root/go - if [ "$2" = "x86_64" ]; then - # Install GCC and Go - wine64 bash.exe -c 'pacman --verbose --debug --noconfirm --ignore pacman --needed -S base-devel mingw-w64-x86_64-gcc mingw-w64-x86_64-go' - - # Build - wine64 bash.exe -c 'export PATH="$PATH:/mingw64/bin" && cd /c/users/root/Documents/stfs && export GOPATH="/c/users/root/go" && export GOROOT="/mingw64/lib/go" export GOARCH=amd64 && go build -o out/stfs.windows-x86_64.exe ./cmd/stfs' - else + if [ "$2" = "i686" ]; then # Install GCC and Go wine64 bash.exe -c 'pacman --verbose --debug --noconfirm --ignore pacman --needed -S base-devel mingw-w64-i686-gcc mingw-w64-i686-go' # Build wine64 bash.exe -c 'export PATH="$PATH:/mingw32/bin" && cd /c/users/root/Documents/stfs && export GOPATH="/c/users/root/go" && export GOROOT="/mingw32/lib/go" && export GOARCH=386 && go build -o out/stfs.windows-i686.exe ./cmd/stfs' + else + # Install GCC and Go + wine64 bash.exe -c 'pacman --verbose --debug --noconfirm --ignore pacman --needed -S base-devel mingw-w64-x86_64-gcc mingw-w64-x86_64-go' + + # Build + wine64 bash.exe -c 'export PATH="$PATH:/mingw64/bin" && cd /c/users/root/Documents/stfs && export GOPATH="/c/users/root/go" && export GOROOT="/mingw64/lib/go" export GOARCH=amd64 && go build -o out/stfs.windows-x86_64.exe ./cmd/stfs' fi # Copy binaries to staging directory