Merge pull request #114 from lhy0403/master

Sync dev with master

.github/workflows/build-push.yml

@@ -0,0 +1,121 @@
+name: Build Cross-platform Qv2ray
+
+on: push
+
+jobs:
+  Windows:
+    name: Push build for win64
+    runs-on: windows-2019
+    steps:
+      - name: Checkout Sources
+        uses: actions/checkout@master
+      - name: Restore Git Submodules
+        run: git submodule update --init
+# --------------------------------------------------------
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v1
+        with:
+          arch: win64_mingw73
+# --------------------------------------------------------
+      - name: Build Qv2ray
+        run: |
+          mkdir build
+          cd build
+          qmake ..
+          mingw32-make -j4
+      - name: Make release package
+        run: |
+          cd build
+          mkdir package
+          cd package
+          copy ..\release\Qv2ray.exe .\
+          copy ..\..\libs\libcrypto-1_1.dll .\
+          copy ..\..\libs\libssl-1_1.dll .\
+          windeployqt ./Qv2ray.exe --compiler-runtime
+          cd ..
+          ..\tools\7z.exe a Qv2ray.zip .\package
+      - name: Upload Artifact
+        uses: actions/upload-artifact@master
+        with:
+          name: Qv2ray.Win64.zip
+          path: build/Qv2ray.zip
+
+# =========================================================================================
+
+  macOS:
+    name: Push build for macOS
+    runs-on: macOS-10.14
+    steps:
+      - name: Checkout Sources
+        uses: actions/checkout@master
+      - name: Restore Git Submodules
+        run: git submodule update --init
+# --------------------------------------------------------
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v1
+# --------------------------------------------------------
+      - name: Build Qv2ray
+        run: |
+          mkdir build
+          cd build
+          qmake ..
+          make -j4
+      - name: Make Package 
+        run: |
+          cd build
+          cd Qv2ray.app
+          macdeployqt ./
+          cd ..
+          tar czf Qv2ray.app.tar.gz Qv2ray.app
+      - name: Upload Artifact
+        uses: actions/upload-artifact@master
+        with:
+          name: Qv2ray.macOS.app.zip
+          path: build/Qv2ray.app.tar.gz
+# ===================================================================================
+          
+  Linux:
+    name: Push build for Linux
+    runs-on: ubuntu-16.04
+    steps:
+      - name: Checkout Sources
+        uses: actions/checkout@master
+      - name: Restore Git Submodules
+        run: git submodule update --init
+# --------------------------------------------------------
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v1
+# --------------------------------------------------------
+      - name: Install libgl-dev and openssl libx11-dev libxkbcommon-x11-dev
+        run: sudo apt install -y libgl-dev openssl libx11-dev libxkbcommon-x11-dev mlocate
+      - name: Update Locate DB
+        run: sudo updatedb
+      - name: Build Qv2ray
+        run: |
+          mkdir build
+          cd build
+          qmake ..
+          make -j4
+      - name: Generate FS Structure for AppImage
+        run: | 
+          cd build
+          make install INSTALL_ROOT=AppDir
+          cd AppDir
+          mkdir -p ./opt/Qv2ray/lib/
+          cp $(locate $(strings $(locate libQt5Network.so|grep usr|head -n1)|grep libssl.so)|grep /lib/|head -n1) ./opt/Qv2ray/lib/
+          cp $(locate $(strings $(locate libQt5Network.so|grep usr|head -n1)|grep crypto.so)|grep /lib/|head -n1) ./opt/Qv2ray/lib/
+      - name: Build AppImage using linuxdeployqt
+        run: |
+          cd build/AppDir
+          wget https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage
+          mv ./linuxdeployqt-6-x86_64.AppImage ../
+          chmod +x ../linuxdeployqt-6-x86_64.AppImage
+          ../linuxdeployqt-6-x86_64.AppImage --appimage-extract 
+          ./squashfs-root/AppRun opt/Qv2ray/share/applications/Qv2ray.desktop -appimage -no-strip -always-overwrite
+          mv ./Qv2ray*.AppImage ./Qv2ray.AppImage
+      - name: Upload Artifact
+        uses: actions/upload-artifact@master
+        with:
+          name: Qv2ray.linux.AppImage
+          path: build/AppDir/Qv2ray.AppImage
+

.github/workflows/build-release.yml

@@ -33,7 +33,7 @@ jobs:
           copy ..\release\Qv2ray.exe .\
           copy ..\..\libs\libcrypto-1_1.dll .\
           copy ..\..\libs\libssl-1_1.dll .\
-          windeployqt ./Qv2ray.exe
+          windeployqt ./Qv2ray.exe --compiler-runtime
           cd ..
           ..\tools\7z.exe a Qv2ray.zip .\package
       - name: Upload Artifact
@@ -119,6 +119,7 @@ jobs:
           cd AppDir
           mkdir -p ./opt/Qv2ray/lib/
           cp /lib/x86_64-linux-gnu/libssl.so.1.0.0 /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 ./opt/Qv2ray/lib/
+          cp /lib/x86_64-linux-gnu/libssl.so.1.1 /lib/x86_64-linux-gnu/libcrypto.so.1.1 ./opt/Qv2ray/lib/
       - name: Build AppImage using linuxdeployqt
         run: |
           cd build/AppDir

README.md

@@ -8,7 +8,7 @@
 
 *任何尝试下载或下载 Qv2ray 任意分支或发行版即代表您同意本项目作者不承担任何由于您违反以上准则所带来的任何法律责任。*
 
-# Qv2ray
+# Qv2ray - Make v2ray real cross-platform
 
 [![HitCount](http://hits.dwyl.io/lhy0403/Qv2ray.svg)](http://hits.dwyl.io/lhy0403/Qv2ray) ![GitHub Releases](https://img.shields.io/github/downloads/lhy0403/Qv2ray/latest/total?style=flat-square)