ci: mingw64: speed workflow

xfangfang · Sep 26, 2023 · 699e3e2 · 699e3e2
1 parent 4348cc2
commit 699e3e2
Showing 1 changed file with 6 additions and 22 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -118,6 +118,7 @@ jobs:
  runs-on: windows-2022
  env:
  MSYSTEM: MINGW64
+ MSYS2_PATH_TYPE: inherit
  defaults:
  run:
  shell: C:\shells\msys2bash.cmd {0}
@@ -129,7 +130,7 @@ jobs:
  fetch-depth: 0
  - name: Install dependency
  run: |
- pacman -S --noconfirm --noprogressbar mingw-w64-x86_64-gcc mingw-w64-x86_64-ninja mingw-w64-x86_64-cmake git p7zip
+ pacman -S --noconfirm --noprogressbar mingw-w64-x86_64-gcc mingw-w64-x86_64-ninja
 
  curl -LO https://github.com/xfangfang/wiliwili/releases/download/v0.1.0/mingw-w64-x86_64-mpv-0.36.0-3-any.pkg.tar.zst
  pacman -U --noconfirm *.pkg.tar.zst
@@ -156,33 +157,16 @@ jobs:
  -DWEBP_BUILD_EXTRAS=OFF
  cmake --build build
  cmake --install build
-
- curl -sL https://github.com/curl/curl/releases/download/curl-7_88_1/curl-7.88.1.tar.xz | tar Jxf - -C /tmp
- cd /tmp/curl-7.88.1
- cmake -B build -G Ninja \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX \
- -DCURL_USE_SCHANNEL=ON \
- -DBUILD_SHARED_LIBS=OFF \
- -DHTTP_ONLY=ON \
- -DCURL_DISABLE_PROGRESS_METER=OFF \
- -DBUILD_CURL_EXE=OFF \
- -DBUILD_TESTING=OFF \
- -DUSE_LIBIDN2=OFF \
- -DUSE_WIN32_IDN=ON \
- -DCURL_USE_LIBSSH2=OFF \
- -DCURL_USE_LIBPSL=OFF \
- -DZLIB_USE_STATIC_LIBS=ON
- cmake --build build
- cmake --install build
-
  - name: Build
  run: |
  cmake -B build -G Ninja \
  -DCMAKE_BUILD_TYPE=Release \
  -DPLATFORM_DESKTOP=ON \
  -DWIN32_TERMINAL=OFF \
- -DUSE_SYSTEM_CURL=ON \
+ -DCURL_DISABLE_PROGRESS_METER=ON \
+ -DUSE_LIBIDN2=OFF \
+ -DUSE_WIN32_IDN=ON \
+ -DCMAKE_USE_LIBSSH2=OFF \
  -DZLIB_USE_STATIC_LIBS=ON
  cmake --build build
  cd build