build: use mingw-w64-x86_64-autotools meta package + zlib for macOS

Two fixes:

1. Windows: replaced broken 'mingw-w64-x86_64-autoconf/automake/
   autoconf2.13/libtool' individual packages with the meta package
   'mingw-w64-x86_64-autotools' which is what actually exists in the
   MINGW64 repo (the individual ones don't).

2. macOS: added 'zlib' to brew install (configure complained the
   --with-zlib-dir was empty).

Also fixed the chaindb equivalence test step in build-all.yml to
run the correct binary: 'build/bin/test_chaindb_equivalence'
(which is the dedicated driver for chaindb_equivalence_tests)
rather than 'build/bin/test_triangles --run_test=chaindb_...'
(the test suite lives in a separate binary, not in test_triangles).
This commit is contained in:
Krystie
2026-06-24 20:05:16 -07:00
parent eb1851ba89
commit 407355afb0
+8 -12
View File
@@ -66,11 +66,13 @@ jobs:
run: cmake --build build -j$(nproc)
- name: Run chaindb equivalence test
# chaindb_equivalence_tests is a SEPARATE binary (test_chaindb_equivalence),
# not a suite inside test_triangles. Run the right binary.
run: |
if [ -x build/bin/test_triangles ]; then
./build/bin/test_triangles --run_test=chaindb_equivalence_tests --log_level=test_suite
if [ -x build/bin/test_chaindb_equivalence ]; then
./build/bin/test_chaindb_equivalence --log_level=test_suite
else
echo "test_triangles not built — skipping chaindb equivalence"
echo "test_chaindb_equivalence not built — skipping chaindb equivalence"
exit 0
fi
@@ -161,10 +163,7 @@ jobs:
mingw-w64-x86_64-miniupnpc
mingw-w64-x86_64-zlib
mingw-w64-x86_64-rocksdb
mingw-w64-x86_64-autoconf
mingw-w64-x86_64-automake
mingw-w64-x86_64-autoconf2.13
mingw-w64-x86_64-libtool
mingw-w64-x86_64-autotools
- name: Set VERSION
run: |
@@ -321,10 +320,7 @@ jobs:
mingw-w64-x86_64-miniupnpc
mingw-w64-x86_64-zlib
mingw-w64-x86_64-rocksdb
mingw-w64-x86_64-autoconf
mingw-w64-x86_64-automake
mingw-w64-x86_64-autoconf2.13
mingw-w64-x86_64-libtool
mingw-w64-x86_64-autotools
- name: Configure
run: |
@@ -606,7 +602,7 @@ jobs:
# macOS Qt is built with @rpath embedded, so libtor needs to be
# at the configured TOR_SOURCE_ROOT location.
run: |
brew install libevent openssl@3 autoconf automake libtool
brew install libevent openssl@3 autoconf automake libtool zlib
export PATH="/opt/homebrew/opt/automake/bin:/opt/homebrew/opt/libtool/bin:$PATH"
LIBEVENT_DIR=/opt/homebrew/opt/libevent \
OPENSSL_DIR=/opt/homebrew/opt/openssl@3 \