fix: solve ci issues

saturneric · Jul 29, 2024 · 3f99249 · 3f99249
1 parent 8f1edf2
commit 3f99249
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/release-qt5.yml b/.github/workflows/release-qt5.yml
@@ -152,16 +152,15 @@ jobs:
           cd $(echo "/${{github.workspace}}"  | sed 's/\\/\//g' | sed 's/://')
           cd third_party/mimalloc
           mkdir build && cd build
-          cmake -G Ninja -DMI_SECURE=ON ..
-          ninja
-          sudo ninja install
+          cmake -G Ninja -DMI_SECURE=ON -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX .. && ninja
+          ninja install
         if: matrix.os == 'windows-2019'
 
       - name: Build googletest (Linux)
         run: |
           cd ${{github.workspace}}/third_party/googletest
           mkdir build && cd build
-          cmake -G Ninja ..
+          cmake -G Ninja -DBUILD_SHARED_LIBS=ON ..
           ninja
           sudo ninja install
         if: matrix.os == 'ubuntu-20.04'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -180,16 +180,15 @@ jobs:
           cd $(echo "/${{github.workspace}}"  | sed 's/\\/\//g' | sed 's/://')
           cd third_party/mimalloc
           mkdir build && cd build
-          cmake -G Ninja -DMI_SECURE=ON ..
-          ninja
-          sudo ninja install
+          cmake -G Ninja -DMI_SECURE=ON -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX .. && ninja
+          ninja install
         if: matrix.os == 'windows-2019'
 
       - name: Build googletest (Linux)
         run: |
           cd ${{github.workspace}}/third_party/googletest
           mkdir build && cd build
-          cmake -G Ninja ..
+          cmake -G Ninja -DBUILD_SHARED_LIBS=ON ..
           ninja
           sudo ninja install
         if: matrix.os == 'ubuntu-20.04'

diff --git a/modules b/modules
+1 −1		src/m_gpg_info/ts/ModuleGnuPGInfoGathering.en_US.ts
+1 −1		src/m_ver_check/ts/ModuleVersionChecking.en_US.ts
+1 −1		src/m_ver_check/ts/ModuleVersionChecking.it_IT.ts
+1 −1		src/m_ver_check/ts/ModuleVersionChecking.zh_CN.ts
+1 −1		src/m_ver_check/ts/ModuleVersionChecking.zh_TW.ts