update SDK (#2769)

* update SDK * update win sdk * try fix lcov * another try to fix lcov
MerginMaps · Aug 25, 2023 · aebd629 · aebd629 · inputapp-bot · Aug 25, 2023
1 parent 9941186
commit aebd629
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -29,11 +29,11 @@ jobs:
       JDK_VERSION: 11
       SDK_PLATFORM: android-31
       SDK_BUILD_TOOLS: 33.0.1
-      INPUT_SDK_VERSION_ARM: arm-android-20230809-193
-      INPUT_SDK_VERSION_ARM64: arm64-android-20230809-193
+      INPUT_SDK_VERSION_ARM: arm-android-20230824-200
+      INPUT_SDK_VERSION_ARM64: arm64-android-20230824-200
       CCACHE_DIR: /Users/runner/work/ccache
       GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }}
-      CACHE_VERSION: 1
+      CACHE_VERSION: 2
       QT_ANDROID_KEYSTORE_ALIAS: input
       QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }}
       QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }}

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -19,11 +19,11 @@ env:
   QT_VERSION: '6.5.2'
   XC_VERSION: ${{ '14.2' }}
   IOS_CMAKE_TOOLCHAIN_VERSION: "4.4.0" 
-  INPUT_SDK_VERSION: arm64-ios-20230809-150
+  INPUT_SDK_VERSION: arm64-ios-20230824-157
   IOS_PROVISIONING_PROFILE_UUID: 59aaa8d7-516a-4592-8c58-d7d1c1f81610
   KEYCHAIN: ${{ 'inputapp.keychain' }}
   CCACHE_DIR: /Users/runner/work/ccache
-  CACHE_VERSION: 1
+  CACHE_VERSION: 2
 
 concurrency:
   group: ci-${{github.ref}}-ios

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -16,9 +16,9 @@ on:
 
 env:
   CCACHE_DIR: ~/.ccache
-  INPUT_SDK_VERSION: x64-linux-20230809-155
+  INPUT_SDK_VERSION: x64-linux-20230824-162
   QT_VERSION: '6.5.2'
-  CACHE_VERSION: 0
+  CACHE_VERSION: 1
 
 concurrency:
   group: ci-${{github.ref}}-linux

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -17,9 +17,9 @@ on:
 
 env:
   QT_VERSION: '6.5.2'
-  INPUT_SDK_VERSION: x64-osx-20230810-174
+  INPUT_SDK_VERSION: x64-osx-20230824-181
   CCACHE_DIR: /Users/runner/work/ccache
-  CACHE_VERSION: 1
+  CACHE_VERSION: 2
   XC_VERSION: ${{ '14.2' }}
 
 concurrency:
@@ -155,8 +155,9 @@ jobs:
       - name: build lcov summary
         run: |
           cd build-Input-db
-          lcov --directory . --capture --output-file coverage.info
-          lcov --remove coverage.info '*input-sdk/*' '*Qt/*' '*/merginsecrets.cpp' '*/test/*' '/usr/*' '/Applications/*' '/opt/*' '*build-Input-db/*' --output-file coverage.info
+
+          lcov --directory . --capture --output-file coverage.info --no-external
+          lcov --remove coverage.info '*/input-sdk/*' '*Qt/*' '*/merginsecrets.cpp' '*/test/*' '/usr/*' '/Applications/*' '/opt/*' '*build-Input-db/*' --output-file coverage.info
           lcov --list coverage.info
 
       - name: Coveralls

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -26,9 +26,9 @@ jobs:
 
     env:
       QT_VERSION: '6.5.2'
-      INPUT_SDK_VERSION: x64-windows-20230810-202
+      INPUT_SDK_VERSION: x64-windows-20230824-209
       CCACHE_DIR: C:/ccache-cache # https://linux.die.net/man/1/ccache
-      CACHE_VERSION: 1
+      CACHE_VERSION: 3
       VS_VERSION: "2019"
       QT_ARCH: "win64_msvc2019_64"