diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/release-qt5.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/.github/workflows/release-qt5.yml b/.github/workflows/release-qt5.yml index c0b18701..5dbd2fab 100644 --- a/.github/workflows/release-qt5.yml +++ b/.github/workflows/release-qt5.yml @@ -53,6 +53,7 @@ jobs: pacman --noconfirm -S --needed make texinfo automake pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 mingw-w64-x86_64-angleproject libintl msys2-runtime-devel gettext-devel pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive + pacman --noconfirm -S --needed mingw-w64-x86_64-gtest if: matrix.os == 'windows-2019' - name: Install Dependence (Linux) @@ -152,16 +153,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 index 27d679be..18d41b8c 100644 --- 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' |