Skip to content

Commit 2e18dda

Browse files
authored
fix(ci): lock version for gcc and headers
1 parent 9c08c75 commit 2e18dda

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

.github/workflows/CI.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -861,30 +861,8 @@ jobs:
861861
wget
862862
863863
- name: Update Windows dependencies
864-
env:
865-
gcc_version: "14.2.0-3"
866864
shell: msys2 {0}
867865
run: |
868-
broken_deps=(
869-
"mingw-w64-ucrt-x86_64-gcc"
870-
"mingw-w64-ucrt-x86_64-gcc-libs"
871-
)
872-
873-
tarballs=""
874-
for dep in "${broken_deps[@]}"; do
875-
tarball="${dep}-${gcc_version}-any.pkg.tar.zst"
876-
877-
# download and install working version
878-
wget https://repo.msys2.org/mingw/ucrt64/${tarball}
879-
880-
tarballs="${tarballs} ${tarball}"
881-
done
882-
883-
# install broken dependencies
884-
if [ -n "$tarballs" ]; then
885-
pacman -U --noconfirm ${tarballs}
886-
fi
887-
888866
# install dependencies
889867
dependencies=(
890868
"git"
@@ -903,7 +881,29 @@ jobs:
903881
"mingw-w64-ucrt-x86_64-toolchain"
904882
)
905883
906-
pacman -Syu --noconfirm --ignore="$(IFS=,; echo "${broken_deps[*]}")" "${dependencies[@]}"
884+
pacman -Syu --noconfirm "${dependencies[@]}"
885+
886+
# install version-locked dependencies
887+
lock_deps=(
888+
889+
890+
891+
)
892+
tarballs=""
893+
for dep in "${lock_deps[@]}"; do
894+
IFS=@ read -r name version <<< "$dep"
895+
tarball="${name}-${version}-any.pkg.tar.zst"
896+
897+
# download and install working version
898+
wget -N https://repo.msys2.org/mingw/ucrt64/${tarball}
899+
900+
tarballs="${tarballs} ${tarball}"
901+
done
902+
903+
# install broken dependencies
904+
if [ -n "$tarballs" ]; then
905+
pacman -U --noconfirm ${tarballs}
906+
fi
907907
908908
- name: Install Doxygen
909909
# GCC compiled doxygen has issues when running graphviz

0 commit comments

Comments
 (0)