From b8edf2ee04084a33bf93886d1c27375ebf3da3db Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 29 Oct 2019 16:16:04 +0100 Subject: [PATCH] .builds: switch from fedora/latest to debian/testing Fedora builds kept failing at package installation. See ~sircmpwn/builds.sr.ht#220. Signed-off-by: Elias Naur --- .builds/android.yml | 14 +++++++------- .builds/apple.yml | 37 +++++++++++++++++++++---------------- .builds/fedora.yml | 32 -------------------------------- .builds/linux.yml | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 55 deletions(-) delete mode 100644 .builds/fedora.yml create mode 100644 .builds/linux.yml diff --git a/.builds/android.yml b/.builds/android.yml index 5e7e0fca..d85225d1 100644 --- a/.builds/android.yml +++ b/.builds/android.yml @@ -1,7 +1,8 @@ -image: fedora/latest +image: debian/testing packages: - - tar - - java-1.8.0-openjdk-devel + - curl + - unzip + - golang sources: - https://git.sr.ht/~eliasnaur/gio environment: @@ -10,10 +11,9 @@ environment: android_sdk_tools_zip: sdk-tools-linux-3859397.zip android_ndk_zip: android-ndk-r20-linux-x86_64.zip tasks: - - install_go: | - mkdir goroot - cd goroot - curl -s https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz | tar xz + - install_jdk8: | + curl -so jdk.deb "https://cdn.azul.com/zulu/bin/zulu8.42.0.21-ca-jdk8.0.232-linux_amd64.deb" + sudo apt install -y -f ./jdk.deb - install_android: | mkdir android cd android diff --git a/.builds/apple.yml b/.builds/apple.yml index 28eafa29..cdaf5804 100644 --- a/.builds/apple.yml +++ b/.builds/apple.yml @@ -1,19 +1,23 @@ -image: fedora/latest +image: debian/testing packages: - - tar - clang - cmake - python - - llvm-devel - - uuid-devel - - xar-devel - - libplist + - autoconf + - libxml2-dev + - libssl-dev + - libz-dev + - llvm-dev # for cctools + - uuid-dev ## for cctools + - libplist-utils # for gogio + - golang sources: - git@git.sr.ht:~eliasnaur/applesdks - https://git.sr.ht/~eliasnaur/gio - https://git.sr.ht/~eliasnaur/giouiorg - https://github.com/tpoechtrager/cctools-port.git - https://github.com/tpoechtrager/apple-libtapi.git + - https://github.com/mackyle/xar.git environment: APPLE_TOOLCHAIN_ROOT: /home/build/appletools PATH: /home/build/goroot/go/bin:/home/build/go/bin:/usr/bin:$PATH @@ -34,6 +38,17 @@ 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 + - build_xar: | + cd xar/xar + ac_cv_lib_crypto_OpenSSL_add_all_ciphers=yes CC=clang ./autogen.sh --prefix=/usr + make + sudo make install - build_libtapi: | cd apple-libtapi INSTALLPREFIX=$APPLE_TOOLCHAIN_ROOT/libtapi ./build.sh @@ -42,16 +57,6 @@ tasks: cd cctools-port/cctools ./configure --prefix $APPLE_TOOLCHAIN_ROOT/toolchain --with-libtapi=$APPLE_TOOLCHAIN_ROOT/libtapi --target=x86_64-apple-darwin19 make install - - install_go: | - mkdir goroot - cd goroot - curl -s https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz | tar xz - - install_gogio: | - cd gio/cmd - go install ./gogio - - install_appletoolchain: | - cd giouiorg - go build -o $APPLE_TOOLCHAIN_ROOT/tools ./cmd/appletoolchain - test_macos: | cd gio/example export PATH=/home/build/appletools/bin:$PATH diff --git a/.builds/fedora.yml b/.builds/fedora.yml deleted file mode 100644 index c6604b42..00000000 --- a/.builds/fedora.yml +++ /dev/null @@ -1,32 +0,0 @@ -image: fedora/latest -packages: - - tar - - wayland-devel - - libX11-devel - - libxkbcommon-devel - - mesa-libGLES-devel - - mesa-libEGL-devel - - chromium - - wine -sources: - - https://git.sr.ht/~eliasnaur/gio -environment: - PATH: $PATH:/usr/bin:/home/build/goroot/go/bin -tasks: - - install_go: | - mkdir goroot - cd goroot - curl -s https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz | tar xz - - test_gio: | - cd gio - go test ./... - GOOS=windows go test -exec=wine ./... - - test_example: | - cd gio/example - go test ./... - - test_cmd: | - cd gio/cmd - go test ./... - - check_gofmt: | - cd gio - test -z $(gofmt -s -l .) diff --git a/.builds/linux.yml b/.builds/linux.yml new file mode 100644 index 00000000..2cdd9b13 --- /dev/null +++ b/.builds/linux.yml @@ -0,0 +1,33 @@ +image: debian/testing +packages: + - curl + - libwayland-dev + - libx11-dev + - libxkbcommon-dev + - libgles2-mesa-dev + - libegl1-mesa-dev + - wine + - golang +sources: + - https://git.sr.ht/~eliasnaur/gio +environment: + PATH: $PATH:/usr/bin:/home/build/goroot/go/bin +tasks: + - 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' + sudo apt update + sudo apt install -y google-chrome-stable + - test_gio: | + cd gio + go test ./... + GOOS=windows go test -exec=wine ./... + - test_example: | + cd gio/example + go test ./... + - test_cmd: | + cd gio/cmd + go test ./... + - check_gofmt: | + cd gio + test -z $(gofmt -s -l .)