Try harder to build x86 :-)

This commit is contained in:
Neil Alexander 2019-11-28 00:13:42 +00:00
parent 88653861c7
commit f8fdb63b0b
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 6 additions and 4 deletions

View file

@ -14,8 +14,8 @@ install:
build_script: build_script:
- cmd: >- - cmd: >-
cd \projects\yggdrasil-go cd \projects\yggdrasil-go
- c:\msys64\usr\bin\bash -lc "./contrib/msi/build-msi.sh x64" c:\msys64\usr\bin\bash -lc "./contrib/msi/build-msi.sh x64"
- c:\msys64\usr\bin\bash -lc "./contrib/msi/build-msi.sh x86" c:\msys64\usr\bin\bash -lc "./contrib/msi/build-msi.sh x86"
test: off test: off

View file

@ -36,8 +36,10 @@ then
fi fi
# Check the prerequisite files are in place # Check the prerequisite files are in place
[ "${PKGARCH}" == "x64" ] && GOARCH=amd64 CGO_ENABLED=0 ./build || \ (
[ "${PKGARCH}" == "x86" ] && GOARCH=386 CGO_ENABLED=0 ./build || \ [ "${PKGARCH}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=0 ./build
[ "${PKGARCH}" == "x86" ] && GOOS=windows GOARCH=386 CGO_ENABLED=0 ./build
) || \
( (
echo "failed to build Yggdrasil" echo "failed to build Yggdrasil"
exit 1 exit 1