From 53e0733d20b6dfb5829197619032b59abd1aecde Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 5 Dec 2020 13:32:35 +0100 Subject: [PATCH] .builds: test iOS/Android builds of the gioui.org module, not just the example The kitchen example may not yet refer to the newest version of the gioui.org module. Signed-off-by: Elias Naur --- .builds/apple.yml | 4 +++- .builds/linux.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.builds/apple.yml b/.builds/apple.yml index 26885c28..62d1b9af 100644 --- a/.builds/apple.yml +++ b/.builds/apple.yml @@ -61,6 +61,8 @@ tasks: 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 - test_ios: | - cd gio/example + 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 ./... export PATH=/home/build/appletools/bin:$PATH + cd example gogio -target ios -o app.app ./kitchen diff --git a/.builds/linux.yml b/.builds/linux.yml index 876fa2e4..d1942cb9 100644 --- a/.builds/linux.yml +++ b/.builds/linux.yml @@ -74,7 +74,9 @@ tasks: cd gio/cmd go install ./gogio - test_android: | - cd gio/example + 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 - check_gofmt: | cd gio