diff --git a/.builds/apple.yml b/.builds/apple.yml index 62d1b9af..e4ee397e 100644 --- a/.builds/apple.yml +++ b/.builds/apple.yml @@ -37,9 +37,6 @@ tasks: cd ../tools ln -s appletoolchain clang-ios ln -s appletoolchain clang-macos - - install_gogio: | - cd gio/cmd - go install ./gogio - install_appletoolchain: | cd giouiorg go build -o $APPLE_TOOLCHAIN_ROOT/tools ./cmd/appletoolchain @@ -57,12 +54,19 @@ tasks: ./configure --prefix $APPLE_TOOLCHAIN_ROOT/toolchain --with-libtapi=$APPLE_TOOLCHAIN_ROOT/libtapi --target=x86_64-apple-darwin19 make install - test_macos: | - cd gio/example + cd gio export PATH=/home/build/appletools/bin:$PATH - CC=$APPLE_TOOLCHAIN_ROOT/tools/clang-macos CGO_CFLAGS="--sysroot $APPLE_TOOLCHAIN_ROOT/MacOSX.sdk -arch x86_64" CGO_LDFLAGS="--sysroot $APPLE_TOOLCHAIN_ROOT/MacOSX.sdk -arch x86_64" GOOS=darwin CGO_ENABLED=1 go build -o /dev/null ./kitchen + CC=$APPLE_TOOLCHAIN_ROOT/tools/clang-macos CGO_CFLAGS="--sysroot $APPLE_TOOLCHAIN_ROOT/MacOSX.sdk -arch x86_64" CGO_LDFLAGS="--sysroot $APPLE_TOOLCHAIN_ROOT/MacOSX.sdk -arch x86_64" GOOS=darwin CGO_ENABLED=1 go build ./... - test_ios: | cd gio CC=$APPLE_TOOLCHAIN_ROOT/tools/clang-ios CGO_CFLAGS="--sysroot $APPLE_TOOLCHAIN_ROOT/iPhoneOS.sdk -arch arm64" CGO_LDFLAGS="--sysroot $APPLE_TOOLCHAIN_ROOT/iPhoneOS.sdk -arch arm64" GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build -tags ios ./... + - install_gogio: | + cd gio/cmd + go install ./gogio + - test_ios_gogio: | + mkdir tmp + cd tmp + go mod init example.com + go get -d gioui.org/example/kitchen export PATH=/home/build/appletools/bin:$PATH - cd example - gogio -target ios -o app.app ./kitchen + gogio -target ios -o app.app gioui.org/example/kitchen diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index ee76afa6..7e5e4387 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -22,6 +22,3 @@ tasks: - test_cmd: | cd gio/cmd go test ./... - - test_example: | - cd gio/example - go test ./... diff --git a/.builds/linux.yml b/.builds/linux.yml index d1942cb9..d6d12666 100644 --- a/.builds/linux.yml +++ b/.builds/linux.yml @@ -41,9 +41,6 @@ tasks: go test -race ./... GOOS=windows go test -exec=wine ./... GOOS=js GOARCH=wasm go build -o /dev/null ./... - - test_example: | - cd gio/example - go test -race ./... - install_chrome: | curl -s https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' @@ -70,14 +67,18 @@ tasks: mv android-ndk-* ndk-bundle yes|sdkmanager --licenses sdkmanager "platforms;android-29" "build-tools;29.0.2" - - install_gogio: | - cd gio/cmd - go install ./gogio - test_android: | cd gio CC=$ANDROID_SDK_ROOT/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android29-clang GOOS=android GOARCH=arm64 CGO_ENABLED=1 go build ./... - cd example - gogio -target android ./kitchen + - install_gogio: | + cd gio/cmd + go install ./gogio + - test_android_gogio: | + mkdir tmp + cd tmp + go mod init example.com + go get -d gioui.org/example/kitchen + gogio -target android gioui.org/example/kitchen - check_gofmt: | cd gio test -z "$(gofmt -s -l .)" diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index a89e9176..757e80f0 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -19,6 +19,3 @@ tasks: - test_cmd: | cd gio/cmd go test ./... - - test_example: | - cd gio/example - go test ./...