izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(windows): pin curl to working version (#2618)

Browse Source
This commit is contained in:
ReenigneArcher
2024-05-31 18:37:05 -04:00
committed by GitHub
parent f0a00ae356
commit 1a1833cfba
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.codeql-prebuild-cpp-Windows.sh
View File

@@ -4,8 +4,16 @@ set -e
# update pacman # update pacman
pacman --noconfirm -Suy pacman --noconfirm -Suy
# install dependencies # install wget
pacman --noconfirm -S \ 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 \ base-devel \
diffutils \ diffutils \
gcc \ gcc \
@@ -14,7 +22,6 @@ pacman --noconfirm -S \
mingw-w64-ucrt-x86_64-boost \ mingw-w64-ucrt-x86_64-boost \
mingw-w64-ucrt-x86_64-cmake \ mingw-w64-ucrt-x86_64-cmake \
mingw-w64-ucrt-x86_64-cppwinrt \ mingw-w64-ucrt-x86_64-cppwinrt \
mingw-w64-ucrt-x86_64-curl \
mingw-w64-ucrt-x86_64-graphviz \ mingw-w64-ucrt-x86_64-graphviz \
mingw-w64-ucrt-x86_64-miniupnpc \ mingw-w64-ucrt-x86_64-miniupnpc \
mingw-w64-ucrt-x86_64-nlohmann-json \ mingw-w64-ucrt-x86_64-nlohmann-json \

38
.github/workflows/CI.yml vendored
View File

@@ -938,20 +938,30 @@ jobs:
msystem: ucrt64 msystem: ucrt64
update: true update: true
install: >- install: >-
doxygen wget
git
mingw-w64-ucrt-x86_64-boost - name: Update Windows dependencies
mingw-w64-ucrt-x86_64-cmake shell: msys2 {0}
mingw-w64-ucrt-x86_64-cppwinrt run: |
mingw-w64-ucrt-x86_64-curl # download working curl
mingw-w64-ucrt-x86_64-graphviz wget https://repo.msys2.org/mingw/ucrt64/mingw-w64-ucrt-x86_64-curl-8.8.0-1-any.pkg.tar.zst
mingw-w64-ucrt-x86_64-miniupnpc
mingw-w64-ucrt-x86_64-nlohmann-json # install dependencies
mingw-w64-ucrt-x86_64-nodejs pacman -U --noconfirm mingw-w64-ucrt-x86_64-curl-8.8.0-1-any.pkg.tar.zst
mingw-w64-ucrt-x86_64-nsis pacman -Syu --noconfirm --ignore=mingw-w64-ucrt-x86_64-curl \
mingw-w64-ucrt-x86_64-onevpl doxygen \
mingw-w64-ucrt-x86_64-openssl git \
mingw-w64-ucrt-x86_64-opus 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 mingw-w64-ucrt-x86_64-toolchain
- name: Setup python - name: Setup python