Skip to content

Commit 27513af

Browse files
authored
GH-49948: [CI][C++] Revert PR 49931 (Pin MinGW MSYS2 packages) but keep bumped minIO version (#49945)
### Rationale for this change Ready to revert pinned packages on MINGW64 with tests all passing now - see updated umbrella issue #49948 and #49958. Past origin PR discussion #49931 (review) ### What changes are included in this PR? Reverting PR #49931's temporary pins workaround - so completely removing step ` - name: Setup MSYS2`. ### Are these changes tested? Yes, tests now pass on current upstream MSYS2 ### Are there any user-facing changes? No. * GitHub Issue: #49948 Authored-by: Tadeja Kadunc <tadeja.kadunc@gmail.com> Signed-off-by: Rok Mihevc <rok@mihevc.org>
1 parent 72bb3e3 commit 27513af

1 file changed

Lines changed: 0 additions & 34 deletions

File tree

.github/workflows/cpp.yml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -366,40 +366,6 @@ jobs:
366366
- name: Setup MSYS2
367367
shell: msys2 {0}
368368
run: ci/scripts/msys2_setup.sh cpp
369-
- name: Pin MSYS2 packages
370-
# Temporary workaround for #49930: gcc 16 surfaces a cluster of 5
371-
# MINGW64 test failures. Pinning gcc-libs to 15.2 (and C++ packages
372-
# rebuilt against gcc-libs 16.1, for ABI compatibility) avoids all
373-
# of them. #49272/#49462 cover one (arrow-json-test); the other 4
374-
# (async-utility-test, threading-utility-test, dataset-writer-test
375-
# `bad_weak_ptr`, dataset-file-test) need separate fixes — see #49930.
376-
# Remove once all 5 pass on current upstream MSYS2 without these pins
377-
if: matrix.msystem_upper == 'MINGW64'
378-
shell: msys2 {0}
379-
run: |
380-
set -ex
381-
base="https://repo.msys2.org/mingw/mingw64"
382-
urls=(
383-
"$base/mingw-w64-x86_64-gcc-libs-15.2.0-14-any.pkg.tar.zst"
384-
"$base/mingw-w64-x86_64-gcc-15.2.0-14-any.pkg.tar.zst"
385-
"$base/mingw-w64-x86_64-aws-crt-cpp-0.38.4-1-any.pkg.tar.zst"
386-
"$base/mingw-w64-x86_64-boost-libs-1.91.0-1-any.pkg.tar.zst"
387-
"$base/mingw-w64-x86_64-boost-1.91.0-1-any.pkg.tar.zst"
388-
"$base/mingw-w64-x86_64-ccache-4.13.2-1-any.pkg.tar.zst"
389-
"$base/mingw-w64-x86_64-clang-libs-22.1.4-1-any.pkg.tar.zst"
390-
"$base/mingw-w64-x86_64-clang-22.1.4-1-any.pkg.tar.zst"
391-
"$base/mingw-w64-x86_64-cmake-4.3.2-2-any.pkg.tar.zst"
392-
"$base/mingw-w64-x86_64-icu-78.3-1-any.pkg.tar.zst"
393-
"$base/mingw-w64-x86_64-llvm-libs-22.1.4-1-any.pkg.tar.zst"
394-
"$base/mingw-w64-x86_64-llvm-tools-22.1.4-1-any.pkg.tar.zst"
395-
"$base/mingw-w64-x86_64-llvm-22.1.4-1-any.pkg.tar.zst"
396-
"$base/mingw-w64-x86_64-tbb-2022.3.0-1-any.pkg.tar.zst"
397-
"$base/mingw-w64-x86_64-thrift-0.22.0-1-any.pkg.tar.zst"
398-
"$base/mingw-w64-x86_64-zstd-1.5.7-1-any.pkg.tar.zst"
399-
"$base/mingw-w64-x86_64-gflags-2.2.2-7-any.pkg.tar.zst"
400-
"$base/mingw-w64-x86_64-aws-sdk-cpp-1.11.479-1-any.pkg.tar.zst"
401-
)
402-
pacman -U --noconfirm "${urls[@]}"
403369
- name: Cache ccache
404370
uses: actions/cache@v5
405371
with:

0 commit comments

Comments
 (0)