diff --git a/.codeql-prebuild-cpp-Windows.sh b/.codeql-prebuild-cpp-Windows.sh index ff2dc26d548..98b49cc8d6b 100644 --- a/.codeql-prebuild-cpp-Windows.sh +++ b/.codeql-prebuild-cpp-Windows.sh @@ -4,8 +4,16 @@ set -e # update pacman pacman --noconfirm -Suy -# install dependencies +# install wget pacman --noconfirm -S \ + wget + +# download working curl +wget https://repo.msys2.org/mingw/ucrt64/mingw-w64-ucrt-x86_64-curl-8.8.0-1-any.pkg.tar.zst + +# install dependencies +pacman -U --noconfirm mingw-w64-ucrt-x86_64-curl-8.8.0-1-any.pkg.tar.zst +pacman -Syu --noconfirm --ignore=mingw-w64-ucrt-x86_64-curl \ base-devel \ diffutils \ gcc \ @@ -14,7 +22,6 @@ pacman --noconfirm -S \ mingw-w64-ucrt-x86_64-boost \ mingw-w64-ucrt-x86_64-cmake \ mingw-w64-ucrt-x86_64-cppwinrt \ - mingw-w64-ucrt-x86_64-curl \ mingw-w64-ucrt-x86_64-graphviz \ mingw-w64-ucrt-x86_64-miniupnpc \ mingw-w64-ucrt-x86_64-nlohmann-json \ diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 977eba517ff..1d902563fce 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -938,20 +938,30 @@ jobs: msystem: ucrt64 update: true install: >- - doxygen - git - mingw-w64-ucrt-x86_64-boost - mingw-w64-ucrt-x86_64-cmake - mingw-w64-ucrt-x86_64-cppwinrt - mingw-w64-ucrt-x86_64-curl - mingw-w64-ucrt-x86_64-graphviz - mingw-w64-ucrt-x86_64-miniupnpc - mingw-w64-ucrt-x86_64-nlohmann-json - mingw-w64-ucrt-x86_64-nodejs - mingw-w64-ucrt-x86_64-nsis - mingw-w64-ucrt-x86_64-onevpl - mingw-w64-ucrt-x86_64-openssl - mingw-w64-ucrt-x86_64-opus + wget + + - name: Update Windows dependencies + shell: msys2 {0} + run: | + # download working curl + wget https://repo.msys2.org/mingw/ucrt64/mingw-w64-ucrt-x86_64-curl-8.8.0-1-any.pkg.tar.zst + + # install dependencies + pacman -U --noconfirm mingw-w64-ucrt-x86_64-curl-8.8.0-1-any.pkg.tar.zst + pacman -Syu --noconfirm --ignore=mingw-w64-ucrt-x86_64-curl \ + doxygen \ + git \ + mingw-w64-ucrt-x86_64-boost \ + mingw-w64-ucrt-x86_64-cmake \ + mingw-w64-ucrt-x86_64-cppwinrt \ + mingw-w64-ucrt-x86_64-graphviz \ + mingw-w64-ucrt-x86_64-miniupnpc \ + mingw-w64-ucrt-x86_64-nlohmann-json \ + mingw-w64-ucrt-x86_64-nodejs \ + mingw-w64-ucrt-x86_64-nsis \ + mingw-w64-ucrt-x86_64-onevpl \ + mingw-w64-ucrt-x86_64-openssl \ + mingw-w64-ucrt-x86_64-opus \ mingw-w64-ucrt-x86_64-toolchain - name: Setup python