CI: add sign for android

KangLin · Dec 13, 2023 · ffd84a8 · ffd84a8
1 parent 1b08bee
commit ffd84a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 31 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -128,6 +128,9 @@ jobs:
         working-directory: ${{github.workspace}}/build
         env:
           RabbitCommon_DIR: ${{env.SOURCE_DIR}}/RabbitCommon
+          QT_ANDROID_KEYSTORE_PATH: ${RabbitCommon_DIR}/RabbitCommon.keystore
+          QT_ANDROID_KEYSTORE_ALIAS: rabbitcommon
+          QT_ANDROID_KEYSTORE_STORE_PASS: ${{secrets.STOREPASS}}
         run: |
           sudo chmod 777 ${Qt6_DIR}/bin/qt-cmake
           ${Qt6_DIR}/bin/qt-cmake .. \
@@ -138,6 +141,7 @@ jobs:
               -DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
               -DANDROID_PLATFORM=${{env.ANDROID_PLATFORM}} \
               -DANDROID_NATIVE_API_LEVEL=${{env.ANDROID_NATIVE_API_LEVEL}} \
+              -DQT_ANDROID_SIGN_APK=ON \
               -DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
               -DCMAKE_INSTALL_PREFIX=`pwd`/install
           cmake --build . --config ${{matrix.BUILD_TYPE}}  --target all

diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,19 +12,6 @@ environment:
   QT_PASSWORD:
     secure: ejAYGgB+3sBispRxUSr0xw==
   matrix: 
-  ##### msvc 2013 ########  
-  - BUILD_TARGERT: windows_msvc
-    GENERATORS: "Visual Studio 12 2013"
-    TOOLCHAIN_VERSION: 12
-    QT_ROOT: C:\Qt\5.6\msvc2013
-    BUILD_ARCH: x86
-
-  - BUILD_TARGERT: windows_msvc
-    GENERATORS: "Visual Studio 12 2013 Win64"
-    TOOLCHAIN_VERSION: 12
-    QT_ROOT: C:\Qt\5.6\msvc2013_64
-    BUILD_ARCH: x64
-
   ##### msvc 2015 ########
   - BUILD_TARGERT: windows_msvc
     GENERATORS: "Visual Studio 14 2015"
@@ -80,23 +67,6 @@ environment:
     TOOLCHAIN_VERSION: 15
     QT_ROOT: C:\Qt\5.9\msvc2017_64
     BUILD_ARCH: x64
-
-  ##### mingw ########
-  - BUILD_TARGERT: windows_mingw
-    GENERATORS: "MSYS Makefiles"
-    TOOLCHAIN_VERSION: 492_32
-    QT_ROOT: C:\Qt\5.6\mingw49_32
-    BUILD_ARCH: x86
-
-  - BUILD_TARGERT: windows_mingw
-    TOOLCHAIN_VERSION: 530_32
-    QT_ROOT: C:\Qt\5.10\mingw53_32
-    BUILD_ARCH: x86
-
-  - BUILD_TARGERT: windows_mingw
-    TOOLCHAIN_VERSION: 730_64
-    QT_ROOT: C:\Qt\5.12\mingw73_64
-    BUILD_ARCH: x64
 
 matrix:
   fast_finish: false