From e6a5e55a69d619b97b0599977bc1d7aeef30566b Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Tue, 7 Jan 2020 23:30:34 +0800
Subject: [PATCH] Update build scripts

---
 .travis.yml                     | 31 +++++++++++++++++++++++++------
 scripts/build.alpine.release.sh |  9 +--------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0f4d3ab..71fddba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,8 @@ stages:
       if: branch = master
 matrix:
     include:
-    - os: osx
+    - name: "macOS Build"
+      os: osx
       compiler: clang
       osx_image: xcode10.3
       script:
@@ -20,9 +21,9 @@ matrix:
         draft: true
         on:
           tags: true
-    - services: docker
+    - name: "Linux x86_64 Build"
+      services: docker
       script:
-      - docker pull alpine:latest
       - docker run -v $TRAVIS_BUILD_DIR:/root/workdir alpine:latest /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
       deploy:
         provider: releases
@@ -32,12 +33,30 @@ matrix:
         draft: true
         on:
           tags: true
-    - services: docker
+    - name: "Linux ARMHF Build"
+      services: docker
+      script:
+      - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+      - docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:armhf-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+      before_deploy:
+        script:
+        - mv subconverter_linux64.tar.gz subconverter_armhf.tar.gz
+      deploy:
+        provider: releases
+        api_key: "$GITHUB_OAUTH_TOKEN"
+        file: "subconverter_armhf.tar.gz"
+        skip_cleanup: true
+        draft: true
+        on:
+          tags: true
+    - name: "Linux ARM64 Build"
+      services: docker
       arch: arm64
       script:
-      - docker pull alpine:latest
       - docker run -v $TRAVIS_BUILD_DIR:/root/workdir alpine:latest /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
-      - mv subconverter_linux64.tar.gz subconverter_aarch64.tar.gz
+      before_deploy:
+        script:
+        - mv subconverter_linux64.tar.gz subconverter_aarch64.tar.gz
       deploy:
         provider: releases
         api_key: "$GITHUB_OAUTH_TOKEN"
diff --git a/scripts/build.alpine.release.sh b/scripts/build.alpine.release.sh
index ced280f..40d5783 100644
--- a/scripts/build.alpine.release.sh
+++ b/scripts/build.alpine.release.sh
@@ -3,14 +3,7 @@ mkdir obj
 set -xe
 
 apk add gcc g++ build-base linux-headers cmake make autoconf automake libtool
-apk add libressl-dev zlib-dev rapidjson-dev libevent-dev libevent-static zlib-static pcre-dev bzip2-static
-
-git clone https://github.com/curl/curl
-cd curl
-./buildconf
-./configure --with-ssl --disable-ldap --disable-ldaps --disable-rtsp --without-libidn2 > /dev/null
-make install -j4 > /dev/null
-cd ..
+apk add openssl-dev openssl-libs-static curl-dev curl-static nghttp2-static zlib-dev rapidjson-dev libevent-dev libevent-static zlib-static pcre-dev bzip2-static
 
 git clone https://github.com/jbeder/yaml-cpp
 cd yaml-cpp