Merge branch 'master' into cagnulein-patch-2

cagnulein · Jan 10, 2024 · cb119ca · cb119ca
2 parents 30e1cde + d178317
commit cb119ca
Show file tree

Hide file tree

Showing 149 changed files with 21,231 additions and 1,196 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -70,15 +70,20 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.10.11
+          python-version: 3.7
       - name: download python and paddleocr
         run: |
           python -VV
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade setuptools
+          python -m pip install "protobuf<=3.20.2,>=3.1.0"
+          python -m pip install paddlepaddle==2.5.1
+          python -m pip install paddleocr
+          python -m pip install imutils
+          python -m pip install "Pillow<10.0.0"
           python -m pip install opencv-python
+          python -m pip install numpy
           python -m pip install pywin32
-          python -m pip install paddlepaddle-gpu==2.4.2.post117 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html
-          python -m pip install https://files.pythonhosted.org/packages/03/ac/13fbe0ebf110d57a89f055a292d4fe430fee3fb22c56f8c077e63e0c5a4e/paddlepaddle-2.4.2-cp310-cp310-win_amd64.whl
-          python -m pip install paddleocr>=2.0.1
         if: matrix.config.python
 
       - uses: msys2/setup-msys2@v2
@@ -117,16 +122,20 @@ jobs:
             make install
             cd ../..
 
+      - name: Secrets
+        if: github.ref == 'refs/heads/main'
+        run: |
+          cd src
+          echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
+          echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
+          echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
+          echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
+          cd ..  
+
       - name: Build
         run: |
             qmake
-            cd src
-            echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
-            echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
-            echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
-            echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
-            echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
-            cd ..
             make -j8
             cd src/debug
             mkdir output
@@ -144,7 +153,7 @@ jobs:
             cp ../../../windows_openssl/*.* .
             mkdir adb
             mkdir python
-            Copy-Item -Path C:\hostedtoolcache\windows\Python\3.10.11\x64 -Destination python -Recurse
+            Copy-Item -Path C:\hostedtoolcache\windows\Python\3.7.9\x64 -Destination python -Recurse
             cp ../../adb/* adb/
             cd ..
             cd appx
@@ -154,13 +163,6 @@ jobs:
       - name: Build without python
         run: |
             qmake
-            cd src
-            echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
-            echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
-            echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
-            echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
-            echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
-            cd ..
             make -j8
             cd src/debug
             mkdir output
@@ -528,37 +530,12 @@ jobs:
           sudo apt-get install -y xvfb
           Xvfb -ac ${{ env.DISPLAY }} -screen 0 1280x780x24 &
 
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - name: Checkout submodule repo
-        uses: actions/checkout@v2
-        with:
-          repository: bluetiger9/SmtpClient-for-Qt
-          path: "src/smtpclient/"
-          ref: 3fa4a0fe5797070339422cf18b5e9ed8dcb91f9c
-
-      - uses: actions/checkout@v2
-      - name: Checkout submodule repo
-        uses: actions/checkout@v2
-        with:
-          repository: cagnulein/qmdnsengine
-          path: "src/qmdnsengine/"
-          ref: "zwift"
-
-      - uses: actions/checkout@v2
-      - name: Checkout submodule repo
-        uses: actions/checkout@v2
-        with:
-          repository: google/googletest
-          path: "tst/googletest/"
-          ref: "release-1.12.1"
-
-      - uses: actions/checkout@v2
-      - name: Checkout qHttpServer
+      - name: Checkout repository
         uses: actions/checkout@v2
         with:
-          repository: qt-labs/qthttpserver
-          path: "src/qthttpserver"         
+          # This token is provided by Actions, you do not need to create your own token
+          token: ${{ secrets.GITHUB_TOKEN }}
+          submodules: recursive # or 'true' if you want to check out only immediate submodules
 
       - name: Install packages required to run QZ inside workflow
         run: sudo apt update -y && sudo apt-get install -y qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qtquickcontrols2-5-dev libqt5bluetooth5 libqt5widgets5 libqt5positioning5 libqt5xml5 qtconnectivity5-dev qtpositioning5-dev libqt5charts5-dev libqt5charts5 libqt5networkauth5-dev libqt5websockets5* libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev
@@ -646,6 +623,8 @@ jobs:
           ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK
           rm -rf /usr/local/lib/android/sdk/ndk/25.1.8937393
           qmake -spec android-clang 'ANDROID_ABIS=armeabi-v7a arm64-v8a x86 x86_64' 'ANDROID_NDK_ROOT=/usr/local/lib/android/sdk/ndk/21.4.7075529' && make -j4 && make INSTALL_ROOT=${{ github.workspace }}/output/android/ install
+          sed -i '1s|{|{\n   "android-extra-libs": "${{ github.workspace }}/android_openssl/no-asm/latest/arm/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/arm/libssl_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/arm64/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/arm64/libssl_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86/libssl_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86_64/libcrypto_1_1.so,${{ github.workspace }}/android_openssl/no-asm/latest/x86_64/libssl_1_1.so",|' src/android-qdomyos-zwift-deployment-settings.json
+          cat src/android-qdomyos-zwift-deployment-settings.json
 
       - name: Build APK (not usable for production due to unpatched QT library)
         run: cd src; androiddeployqt --input android-qdomyos-zwift-deployment-settings.json --output ${{ github.workspace }}/output/android/ --android-platform android-31 --gradle --aab
@@ -786,15 +765,20 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.10.11
+          python-version: 3.7
       - name: download python and paddleocr
         run: |
           python -VV
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade setuptools
+          python -m pip install "protobuf<=3.20.2,>=3.1.0"
+          python -m pip install paddlepaddle==2.5.1
+          python -m pip install paddleocr
+          python -m pip install imutils
+          python -m pip install "Pillow<10.0.0"
           python -m pip install opencv-python
+          python -m pip install numpy
           python -m pip install pywin32
-          python -m pip install paddlepaddle-gpu==2.4.2.post117 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html
-          python -m pip install https://files.pythonhosted.org/packages/03/ac/13fbe0ebf110d57a89f055a292d4fe430fee3fb22c56f8c077e63e0c5a4e/paddlepaddle-2.4.2-cp310-cp310-win_amd64.whl
-          python -m pip install paddleocr>=2.0.1
         if: matrix.config.python          
 
       - name: Install Qt
@@ -829,16 +813,20 @@ jobs:
             nmake install
             cd ../..          
 
+      - name: Secrets
+        if: github.ref == 'refs/heads/main'
+        run: |
+          cd src
+          echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
+          echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
+          echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
+          echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
+          cd ..        
+
       - name: Build
         run: |
-            qmake
-            cd src
-            echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
-            echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
-            echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
-            echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
-            echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
-            cd ..
+            qmake            
             nmake
             cd src/debug
             mkdir output
@@ -853,7 +841,7 @@ jobs:
             cp ../../../windows_openssl/*.* .
             mkdir adb
             mkdir python
-            Copy-Item -Path C:\hostedtoolcache\windows\Python\3.10.11\x64 -Destination python -Recurse
+            Copy-Item -Path C:\hostedtoolcache\windows\Python\3.7.9\x64 -Destination python -Recurse
             cp ../../adb/* adb/
             cd ..
             cd appx
@@ -862,14 +850,7 @@ jobs:
 
       - name: Build without python
         run: |
-            qmake
-            cd src
-            echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
-            echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
-            echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
-            echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
-            echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
-            cd ..
+            qmake           
             nmake
             cd src/debug
             mkdir output
@@ -915,6 +896,121 @@ jobs:
           path: windows-msvc2019-binary-no-python.zip
         if:  ${{ ! matrix.config.python }}
 
+  window-msvc2019-aiserver-build:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
+        uses: actions/checkout@v2
+        with:
+          repository: bluetiger9/SmtpClient-for-Qt
+          path: "src/smtpclient/"
+          ref: 3fa4a0fe5797070339422cf18b5e9ed8dcb91f9c
+
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
+        uses: actions/checkout@v2
+        with:
+          repository: cagnulein/qmdnsengine
+          path: "src/qmdnsengine/"
+          ref: "zwift"   
+
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
+        uses: actions/checkout@v2
+        with:
+          repository: google/googletest
+          path: "tst/googletest/"
+          ref: "release-1.12.1"
+
+      - uses: actions/checkout@v2
+      - name: Checkout qHttpServer
+        uses: actions/checkout@v2
+        with:
+          repository: qt-labs/qthttpserver
+          path: "src/qthttpserver"      
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '5.15.2'
+          host: 'windows'
+          modules: 'qtnetworkauth qtcharts'
+          target: "desktop"
+          arch: win64_msvc2019_64
+          dir: "${{github.workspace}}/qt/"
+          install-deps: "true"
+          cache: 'true'
+          cache-key-prefix: 'install-qt-action-windows'          
+
+      - name: Install MSVC compiler
+        uses: ilammy/msvc-dev-cmd@v1
+        with: 
+          # 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo
+          toolset: 14.2
+          arch: x64
+
+      - name: download 3rd party files for qthttpserver
+        run: |
+            cp qHttpServerBin/5.15.2/headers/* src/qthttpserver/src/3rdparty/http-parser/
+
+      - name: Build qthttpserver
+        run: |
+            cd src\qthttpserver 
+            qmake
+            nmake
+            nmake install
+            cd ../..          
+
+      - name: Secrets
+        if: github.ref == 'refs/heads/main'
+        run: |
+          cd src
+          echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
+          echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
+          echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h          
+          echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
+          cd ..                    
+
+      - name: Build
+        run: |
+            cd src
+            echo "#define AISERVER" >> aiserver.h
+            cd ..
+            qmake
+            nmake
+            cd src/debug
+            mkdir output
+            mkdir appx
+            cp qdomyos-zwift.exe output/
+            cd output
+            windeployqt --qmldir ../../ qdomyos-zwift.exe
+            cp ../../../icons/iOS/[email protected] .
+            cp ../../AppxManifest.xml .
+            cp ../../windows/zwift-incline-ai-server.py zwift-incline.py
+            cp ../../windows/zwift-incline-climb-portal-ai-server.py zwift-incline-climb-portal.py
+            cp ../../windows/zwift-workout-ai-server.py zwift-workout.py
+            cp ../../windows/*.bat .
+            cp ../../../windows_openssl/*.* .
+            mkdir adb
+            cp ../../adb/* adb/
+            cd ..
+            cd appx
+            #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz                      
+
+      - name: patching qt for bluetooth
+        run: cp qt-patches/windows/5.15.2/binary/msvc2019/*.* ${{ github.workspace }}/src/debug/output/
+
+      - name: Zip artifact for deployment
+        run: Compress-Archive src/debug/output windows-msvc2019-ai-server-binary.zip
+
+      - name: Archive windows binary
+        uses: actions/upload-artifact@v2
+        with:
+          name: windows-msvc2019-ai-server-binary
+          path: windows-msvc2019-ai-server-binary.zip
+
   upload_to_release:
     permissions: write-all
     runs-on: ubuntu-latest
@@ -944,6 +1040,7 @@ jobs:
           files: |
             windows-msvc2019-binary-no-python/*
             windows-msvc2019-binary/*
+            windows-msvc2019-ai-server-binary/*            
             windows-binary-no-python/*
             windows-binary/*
             fdroid-android-trial/*
diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,6 @@
 	path = tst/googletest
 	url = https://github.com/google/googletest.git
 	branch = tags/release-1.12.1
+[submodule "src/qthttpserver"]
+	path = src/qthttpserver
+	url = https://github.com/qt-labs/qthttpserver