diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index 93dad7e5c..8fb20b1e1 100644 --- a/.github/workflows/Dockerfile +++ b/.github/workflows/Dockerfile @@ -7,24 +7,22 @@ FROM ghcr.io/ledgerhq/speculos:latest RUN apt update -y && apt install -y git curl # install autotools bitcoin-core build dependencies -RUN apt install -y automake autotools-dev bsdmainutils build-essential ccache git libboost-dev libboost-filesystem-dev libboost-system-dev libboost-test-dev libevent-dev libminiupnpc-dev libnatpmp-dev libqt5gui5 libqt5core5a libqt5dbus5 libsqlite3-dev libtool libzmq3-dev pkg-config python3 qttools5-dev qttools5-dev-tools qtwayland5 systemtap-sdt-dev +RUN apt install -y bsdmainutils build-essential cmake pkg-config ccache git libboost-dev libboost-filesystem-dev libboost-system-dev libboost-test-dev libevent-dev libminiupnpc-dev libnatpmp-dev libqt5gui5 libqt5core5a libqt5dbus5 libsqlite3-dev libtool libzmq3-dev pkg-config python3 qttools5-dev qttools5-dev-tools qtwayland5 systemtap-sdt-dev # clone bitcoin-core from github and compile it RUN cd / && \ git clone --depth=1 https://github.com/bitcoin/bitcoin.git && \ cd bitcoin && \ - ./autogen.sh && \ - ./configure --enable-suppress-external-warnings && \ - make -j "$(($(nproc)+1))" && \ - mkdir bin && \ - cp src/bitcoind src/bitcoin-cli src/bitcoin-tx src/bitcoin-util src/bitcoin-wallet ./bin + cmake -B build && \ + cmake --build build && \ + cmake --install build FROM ghcr.io/ledgerhq/speculos:latest -COPY --from=0 /bitcoin/bin /bitcoin/bin +COPY --from=0 /usr/local/bin/ /usr/local/bin/ # install runtime dependencies for bitcoind RUN apt update -y && apt install -y libminiupnpc-dev libminiupnpc-dev libnatpmp-dev libevent-dev libzmq3-dev # Add bitcoin binaries to path -ENV PATH=/bitcoin/bin:$PATH +ENV PATH=/usr/local/bin/:$PATH diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png index dc357b293..4fa269da2 100644 Binary files a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png and b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png differ diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00002.png b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00002.png index f2a2d7e11..d680d67be 100644 Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00002.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00002.png differ