Modify etc/Calendar_logqt.ini and ci

KangLin · May 28, 2024 · 7b73971 · 7b73971
1 parent 87037ca
commit 7b73971
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -30,7 +30,7 @@ jobs:
 
     env:
       Calendar_VERSION: v1.0.20
-      VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
+      VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_HOST_TRIPLET: x64-linux
       SOURCE_DIR:  ${{github.workspace}}/.cache/source

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -1,3 +1,5 @@
+# Author: Kang Lin <[email protected]>
+
 name: build_macos
 
 on:
@@ -9,7 +11,7 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  
+
 jobs:
   build_macos:
     strategy:
@@ -28,6 +30,8 @@ jobs:
 
           - qt_version: 5.12.12
 
+    # See: https://docs.github.com/zh/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
+    # See: https://github.com/actions/runner-images/tree/main
     runs-on: macos-13
 
     env:
@@ -36,7 +40,7 @@ jobs:
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install
       qt_modules: qtwebengine ${{matrix.qt_modules}}
-      VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
+      VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       artifact_name: build_macos
       Calendar_VERSION: 1.0.20
@@ -84,7 +88,8 @@ jobs:
 
       - name: git clone RabbitCommon
         working-directory: ${{env.SOURCE_DIR}}
-        run: git clone https://github.com/KangLin/RabbitCommon.git
+        run: |
+          git clone https://github.com/KangLin/RabbitCommon.git
       
       - name: Compile
         working-directory: ${{github.workspace}}/build

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -17,21 +17,21 @@ jobs:
         include:
           - qt_version: 6.6.2
             VCPKG_TARGET_TRIPLET: x64-windows
-            VCPKG_PLATFORM_TOOLSET: v142
+            VCPKG_PLATFORM_TOOLSET: v143
             qt_arch: win64_msvc2019_64
             CMAKE_GENERATOR_PLATFORM: x64
             qt_modules: qtscxml qtmultimedia qtwebengine qtwebchannel qtwebsockets qtwebview qtpositioning
 
           - qt_version: 5.15.2
             VCPKG_TARGET_TRIPLET: x64-windows
-            VCPKG_PLATFORM_TOOLSET: v142
+            VCPKG_PLATFORM_TOOLSET: v143
             VCPKG_MANIFEST_DIR: "\\vcpkg\\manifests"
             qt_arch: win64_msvc2019_64
             CMAKE_GENERATOR_PLATFORM: x64
 
           - qt_version: 5.12.12
             VCPKG_TARGET_TRIPLET: x86-windows
-            VCPKG_PLATFORM_TOOLSET: v141
+            VCPKG_PLATFORM_TOOLSET: v143
             VCPKG_MANIFEST_DIR: "\\vcpkg\\manifests"
             qt_arch: win32_msvc2017
             CMAKE_GENERATOR_PLATFORM: Win32
@@ -42,7 +42,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}\.cache\source
       TOOSL_DIR:   ${{github.workspace}}\.cache\tools
       INSTALL_DIR: ${{github.workspace}}\.cache\install
-      VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
+      VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
       VCPKG_MANIFEST_DIR: "${{github.workspace}}${{matrix.VCPKG_MANIFEST_DIR}}"

diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar
diff --git a/etc/Calendar_logqt.ini b/etc/Calendar_logqt.ini
@@ -1,12 +1,27 @@
 [Log]
+;; Log file path.
 ;Path=log
+;; Log file name prefix
 Name="yyyy-MM-dd"
-Pattern="%{time hh:mm:ss.zzz} %{pid}|%{threadid} %{if-debug}DEBUG%{endif}%{if-info}INFO%{endif}%{if-warning}WARN%{endif}%{if-critical}ERROR%{endif}%{if-fatal}FATALF%{endif} %{category} - %{message}"
-; "[%{file}:%{line}, %{function}]"
+;; Message format pattern. See: https://doc.qt.io/qt-6/qtlogging.html#qSetMessagePattern
+Pattern="[%{time hh:mm:ss.zzz} %{pid}|%{threadid} %{if-debug}D%{endif}%{if-info}I%{endif}%{if-warning}W%{endif}%{if-critical}E%{endif}%{if-fatal}F%{endif}] %{category} - %{message}"
+                                                                 ;[%{file}:%{line}, %{function}]"
+;; Log file length
 ;Length=100M
+;; Log file count
 ;Count=10
+;; Write log file interval
 ;Interval=1
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Log rules
+;; Please see QLoggingCategory documents: https://doc.qt.io/qt-6/qloggingcategory.html#logging-rules
+;; Format:
+;;    <category>[.<type>] = true|false
 [Rules]
-;*.debug=false
+;*=false
+*.debug=false
 ;*.warning=false
+
+;RabbitCommon*=false
+;RabbitCommon.Updater=true
+1 −1		.github/workflows/android.yml
+3 −1		.github/workflows/macos.yml
+4 −4		.github/workflows/msvc.yml