From c03dde453ca83fc6f01f0a27e035b94fb54c5c76 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Sat, 29 Aug 2020 17:50:31 +0200
Subject: [PATCH] .builds: merge android.yml into linux.yml

sr.ht recently lowered the number of concurrent builders per commit
to 4.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 .builds/android.yml | 34 ----------------------------------
 .builds/linux.yml   | 27 ++++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 35 deletions(-)
 delete mode 100644 .builds/android.yml

diff --git a/.builds/android.yml b/.builds/android.yml
deleted file mode 100644
index 2b17cfe5..00000000
--- a/.builds/android.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-image: debian/testing
-packages:
- - curl
- - unzip
- - golang
-sources:
- - https://git.sr.ht/~eliasnaur/gio
-environment:
-   PATH: /usr/bin:/home/build/go/bin:/home/build/android/tools/bin
-   ANDROID_SDK_ROOT: /home/build/android
-   android_sdk_tools_zip: sdk-tools-linux-3859397.zip
-   android_ndk_zip: android-ndk-r20-linux-x86_64.zip
-tasks:
- - 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
-     curl -so sdk-tools.zip https://dl.google.com/android/repository/$android_sdk_tools_zip
-     unzip -q sdk-tools.zip
-     rm sdk-tools.zip
-     curl -so ndk.zip https://dl.google.com/android/repository/$android_ndk_zip
-     unzip -q ndk.zip
-     rm ndk.zip
-     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/example
-     gogio -target android ./kitchen
diff --git a/.builds/linux.yml b/.builds/linux.yml
index e4e73f14..853cc188 100644
--- a/.builds/linux.yml
+++ b/.builds/linux.yml
@@ -22,13 +22,17 @@ packages:
  - sway
  - grim
  - wine
+ - unzip
 sources:
  - https://git.sr.ht/~eliasnaur/gio
 secrets:
  - 0dd5efdf-400e-4735-8320-98b44844dfd0
 environment:
  GOFLAGS: -mod=readonly
- PATH: /home/build/sdk/go/bin:/usr/bin
+ PATH: /home/build/sdk/go/bin:/usr/bin:/home/build/go/bin:/home/build/android/tools/bin
+ ANDROID_SDK_ROOT: /home/build/android
+ android_sdk_tools_zip: sdk-tools-linux-3859397.zip
+ android_ndk_zip: android-ndk-r20-linux-x86_64.zip
 tasks:
  - install_go1_14: |
      mkdir -p /home/build/sdk
@@ -55,6 +59,27 @@ tasks:
  - check_gofmt: |
      cd gio
      test -z "$(gofmt -s -l .)"
+ - 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
+     curl -so sdk-tools.zip https://dl.google.com/android/repository/$android_sdk_tools_zip
+     unzip -q sdk-tools.zip
+     rm sdk-tools.zip
+     curl -so ndk.zip https://dl.google.com/android/repository/$android_ndk_zip
+     unzip -q ndk.zip
+     rm ndk.zip
+     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/example
+     gogio -target android ./kitchen
  - annotate: |
      go get git.sr.ht/~sircmpwn/annotatego
      cd gio