diff --git a/appveyor.yml b/appveyor.yml index 11012b6a..68fbc56d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,13 +8,18 @@ environment: MSYSTEM: MINGW64 MSYS2_PATH_TYPE: inherit CHERE_INVOKING: enabled_from_arguments + GO111MODULE: on + GOPATH: c:\gopath + +stack: go 1.15 build_script: - cmd: >- cd %APPVEYOR_BUILD_FOLDER% ##### MinGW build - set OPT_PATH=C:\msys64\mingw32\bin;C:\msys64\mingw64\bin; -- set PATH=%OPT_PATH%%PATH% +- set PATH=%GOPATH%\bin;%OPT_PATH%%PATH% +- go install github.com/tc-hib/go-winres@latest - c:\msys64\usr\bin\bash -lc "./contrib/msi/build-msi.sh x64" - c:\msys64\usr\bin\bash -lc "./contrib/msi/build-msi.sh x86" diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh index 4410b6ce..74d78623 100755 --- a/contrib/msi/build-msi.sh +++ b/contrib/msi/build-msi.sh @@ -49,8 +49,9 @@ fi which go #install go-winres -go install github.com/tc-hib/go-winres@latest -~/go/bin/go-winres init +#go install github.com/tc-hib/go-winres@latest +go-winres init + # Build Mesh! [ "${PKGARCH}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ LDFLAGS="-H windowsgui" ./build [ "${PKGARCH}" == "x86" ] && GOOS=windows GOARCH=386 CGO_ENABLED=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ LDFLAGS="-H windowsgui" ./build