From 38314a778b5fc066bfb414a9afe5b31579c4b2ce Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Wed, 18 Mar 2020 19:48:41 +0800
Subject: [PATCH] Update build scripts

---
 .github/workflows/build.yml     | 13 ++++++-------
 .travis.yml                     | 11 +++++------
 scripts/build.alpine.release.sh |  2 --
 scripts/build.macos.release.sh  |  6 +++---
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a879af9..9def48f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,8 +13,8 @@ jobs:
     - name: Upload
       uses: actions/upload-artifact@v1
       with:
-        name: subconverter_linux32.tar.gz
-        path: subconverter_linux32.tar.gz
+        name: subconverter_linux32
+        path: subconverter/
 
   linux64_build:
     runs-on: ubuntu-latest
@@ -26,8 +26,8 @@ jobs:
     - name: Upload
       uses: actions/upload-artifact@v1
       with:
-        name: subconverter_linux64.tar.gz
-        path: subconverter_linux64.tar.gz
+        name: subconverter_linux64
+        path: subconverter/
 
   macos_build:
     runs-on: macos-latest
@@ -39,6 +39,5 @@ jobs:
     - name: Upload
       uses: actions/upload-artifact@v1
       with:
-        name: subconverter_darwin64.tar.gz
-        path: subconverter_darwin64.tar.gz
-
+        name: subconverter_darwin64
+        path: subconverter/
diff --git a/.travis.yml b/.travis.yml
index ae6766e..fadbc07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ jobs:
       osx_image: xcode10.3
       script:
       - bash scripts/build.macos.release.sh
+      - tar czf subconverter_darwin64.tar.gz subconverter
       deploy:
         provider: releases
         token: "$GITHUB_OAUTH_TOKEN"
@@ -25,8 +26,7 @@ jobs:
       services: docker
       script:
       - docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:x86-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:
-        - mv subconverter_linux64.tar.gz subconverter_linux32.tar.gz
+      - tar czf subconverter_linux32.tar.gz subconverter/
       deploy:
         provider: releases
         token: "$GITHUB_OAUTH_TOKEN"
@@ -39,6 +39,7 @@ jobs:
       services: docker
       script:
       - docker run -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:amd64-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+      - tar czf subconverter_linux64.tar.gz subconverter/
       deploy:
         provider: releases
         token: "$GITHUB_OAUTH_TOKEN"
@@ -52,8 +53,7 @@ jobs:
       arch: arm64
       script:
       - 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:
-        - mv subconverter_linux64.tar.gz subconverter_armhf.tar.gz
+      - tar czf subconverter_armhf.tar.gz subconverter/
       deploy:
         provider: releases
         token: "$GITHUB_OAUTH_TOKEN"
@@ -67,8 +67,7 @@ jobs:
       arch: arm64
       script:
       - docker run -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:aarch64-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:
-        - mv subconverter_linux64.tar.gz subconverter_aarch64.tar.gz
+      - tar czf subconverter_aarch64.tar.gz subconverter/
       deploy:
         provider: releases
         token: "$GITHUB_OAUTH_TOKEN"
diff --git a/scripts/build.alpine.release.sh b/scripts/build.alpine.release.sh
index 33a18c5..6079fbb 100644
--- a/scripts/build.alpine.release.sh
+++ b/scripts/build.alpine.release.sh
@@ -20,5 +20,3 @@ chmod +rx subconverter
 chmod +r *
 cd ..
 mv base subconverter
-
-tar czf subconverter_linux64.tar.gz subconverter/
diff --git a/scripts/build.macos.release.sh b/scripts/build.macos.release.sh
index ec16242..0eb76b7 100644
--- a/scripts/build.macos.release.sh
+++ b/scripts/build.macos.release.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -xe
 
-brew reinstall rapidjson libevent zlib pcre2 bzip2 pkgconfig
+brew reinstall rapidjson libevent zlib pcre2 bzip2 libssh2 pkgconfig
 
 git clone https://github.com/curl/curl
 cd curl
@@ -25,18 +25,18 @@ cp /usr/local/opt/openssl@1.1/lib/libssl.a .
 cp /usr/local/opt/openssl@1.1/lib/libcrypto.a .
 cp /usr/local/lib/libpcre2-8.a .
 cp /usr/local/opt/bzip2/lib/libbz2.a .
+cp /usr/local/lib/libssh2.a .
 
 export CMAKE_CXX_FLAGS="-I/usr/local/include -I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/curl/include"
 cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 .
 make -j8
 rm subconverter
-c++ -Xlinker -unexported_symbol -Xlinker "*" -o base/subconverter CMakeFiles/subconverter.dir/src/*.o libpcre2-8.a libevent.a libcurl.a libz.a libssl.a libcrypto.a libyaml-cpp.a libbz2.a -ldl -lpthread -O3
+c++ -Xlinker -unexported_symbol -Xlinker "*" -o base/subconverter CMakeFiles/subconverter.dir/src/*.o libpcre2-8.a libevent.a libcurl.a libz.a libssl.a libcrypto.a libyaml-cpp.a libbz2.a libssh2.a -ldl -lpthread -O3
 
 cd base
 chmod +rx subconverter
 chmod +r *
 cd ..
 mv base subconverter
-tar czf subconverter_darwin64.tar.gz subconverter
 
 set +xe