Merge pull request #2007 from xiaoyifang/staged

daily merge,staged->dev

.clang-tidy

@@ -26,13 +26,15 @@ Checks: >
   -google-readability-casting,
   -hicpp-deprecated-headers,
   -hicpp-no-array-decay,
+  -misc-confusable-identifiers,
   -misc-const-correctness,
   -misc-include-cleaner,
   -misc-non-private-member-variables-in-classes,
   -modernize-avoid-c-arrays,
   -modernize-deprecated-headers,
   -modernize-use-nodiscard,
   -modernize-use-trailing-return-type,
+  -performance-enum-size,
   -readability-function-cognitive-complexity,
   -readability-identifier-length,
   -readability-magic-numbers,

.git-blame-ignore-revs

@@ -17,4 +17,10 @@ a11c9e3aeca4329e1982d8fe26bacbb21ab50ddf
 d15081e723756eef053550dc9e06e31d7828dec3
 
 # remove gd::toWString
-c8af0450f1f7f8188004db96e3f53e7e33e2ccad
+c8af0450f1f7f8188004db96e3f53e7e33e2ccad
+
+# remove gddebug.hh and associated functions
+76aaed116bdc3aeb53fd61553aedb877baf9b510
+
+# wstring & wchar -> std::u32string & char32_t
+f1e158578f62c96059bef1a616b75495adb6e2c6

.github/workflows/PR-check-cmake.yml

@@ -51,6 +51,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: false
+      - name: Update brew
+        run: |
+          brew update
       - name: Install dependencies
         run: |
           brew install \
@@ -66,11 +69,11 @@ jobs:
           xapian \
           libzim \
           qt
-
-          wget ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.3.tar.bz2
+      - name: Install eb
+        run: |
+          wget https://github.com/mistydemeo/eb/releases/download/v4.4.3/eb-4.4.3.tar.bz2
           tar xvjf eb-4.4.3.tar.bz2
           cd eb-4.4.3 && ./configure && make -j 8 && sudo make install && cd ..
-
       - name: Run build
         run: |
           mkdir build_dir

.github/workflows/Release-all.yml

@@ -26,6 +26,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
+      - name: Update brew
+        run: |
+          brew update
       - name: Install dependencies
         run: |
           brew install \
@@ -40,7 +43,8 @@ jobs:
             ninja \
             opencc \
             xapian
-          
+      - name: Install eb
+        run: |
           git clone https://github.com/xiaoyifang/eb.git
           cd eb && ./configure && make -j 8 && sudo make install && cd ..         
       - uses: jurplel/install-qt-action@v4
@@ -61,6 +65,9 @@ jobs:
       - name: Package
         run: |
           cmake --install build_dir/
+      - name: Print package content
+        run: |
+          ls -Rl ./build_dir/redist
       - uses: actions/upload-artifact@v4
         with:
           name: macOS-${{ matrix.os }}-Qt${{ matrix.qt_ver }}