Merge pull request #1499 from capnproto/kenton/try-fix-mingw

Try to fix MinGW CI.
capnproto · Aug 3, 2022 · c35c724 · c35c724
2 parents 6ca3362 + 0858e94
commit c35c724
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml
@@ -131,7 +131,7 @@ jobs:
             rmdir /s /q C:\PROGRA~1\POSTGR~1
 
             echo "Building Cap'n Proto with MinGW"
-            cmake -Hc++ -Bbuild-output -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=%CD%\capnproto-c++-install -DCMAKE_SH="CMAKE_SH-NOTFOUND"
+            cmake -Hc++ -Bbuild-output -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=%CD%\capnproto-c++-install -DCMAKE_SH="CMAKE_SH-NOTFOUND" -DCMAKE_CXX_STANDARD_LIBRARIES="-static-libgcc -static-libstdc++"
             cmake --build build-output --target install -- -j2
 
             echo "Building Cap'n Proto samples with MinGW"

diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
@@ -55,7 +55,8 @@ jobs:
         run: |
           sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update -qq
-          sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
+          sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
+          sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
       - name: install dependencies
         run: |
             export DEBIAN_FRONTEND=noninteractive