diff options
| author | merge-script <fanquake@gmail.com> | 2024-08-29 12:30:11 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-08-29 12:30:11 +0100 |
| commit | 5c7d4b9dec7977ee697c64c290c96f69d53d0884 (patch) | |
| tree | 04b2bf3c5950a6f34df9147f823b6ecf8a58e821 | |
| parent | 7a226eb4d97bb76cd8c13afe4ec7c0aab5046b13 (diff) | |
| parent | 78358ce09d2a62a469a544249e02e02f9f7b94cd (diff) | |
| download | bitcoin-5c7d4b9dec7977ee697c64c290c96f69d53d0884.tar.xz | |
Merge bitcoin/bitcoin#30749: Remove bsdmainutils from doc/ci
78358ce09d2a62a469a544249e02e02f9f7b94cd ci: add libzmq3-dev to test-each-commit job (fanquake)
a2b1d2c5ec25a91e224c2b83a5588128e81c6faf doc: remove bsdmainutils (fanquake)
36ff336d2e417977340c1f6ca70f55433ce8d9f8 ci: remove bsdmainutils (fanquake)
Pull request description:
This was previously used to install `hexdump` (for the tests). However that isn't used by CMake. I'm not aware of any other tools from this package being used.
ACKs for top commit:
maflcko:
ACK 78358ce09d2a62a469a544249e02e02f9f7b94cd
hebasto:
ACK 78358ce09d2a62a469a544249e02e02f9f7b94cd.
Tree-SHA512: 01c1be81feba03a9645e3d382067df4cd7c64de184871c8d9691053a8f871fcedf48d298303554560df2cb1949fb35d5ce9ff20c751ff35789b7689d656c0287
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rwxr-xr-x | ci/test/00_setup_env.sh | 2 | ||||
| -rw-r--r-- | doc/build-unix.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd2453d4fd..559ad4933f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: echo "TEST_BASE=$(git rev-list -n$((${{ env.MAX_COUNT }} + 1)) --reverse HEAD $EXCLUDE_MERGE_BASE_ANCESTORS | head -1)" >> "$GITHUB_ENV" - run: | sudo apt-get update - sudo apt-get install clang ccache build-essential cmake pkg-config bsdmainutils python3-zmq libevent-dev libboost-dev libsqlite3-dev libdb++-dev systemtap-sdt-dev libminiupnpc-dev libnatpmp-dev qtbase5-dev qttools5-dev qttools5-dev-tools qtwayland5 libqrencode-dev -y + sudo apt-get install clang ccache build-essential cmake pkg-config python3-zmq libevent-dev libboost-dev libsqlite3-dev libdb++-dev systemtap-sdt-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev qtbase5-dev qttools5-dev qttools5-dev-tools qtwayland5 libqrencode-dev -y - name: Compile and run tests run: | # Run tests on commits after the last merge commit and before the PR head commit diff --git a/ci/test/00_setup_env.sh b/ci/test/00_setup_env.sh index 98098c9e75..944655d8ad 100755 --- a/ci/test/00_setup_env.sh +++ b/ci/test/00_setup_env.sh @@ -64,7 +64,7 @@ export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out} # The folder for previous release binaries. # This folder exists only on the ci guest, and on the ci host as a volume. export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:-$BASE_ROOT_DIR/prev_releases} -export CI_BASE_PACKAGES=${CI_BASE_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps bison e2fsprogs cmake} +export CI_BASE_PACKAGES=${CI_BASE_PACKAGES:-build-essential libtool autotools-dev automake pkg-config curl ca-certificates ccache python3 rsync git procps bison e2fsprogs cmake} export GOAL=${GOAL:-install} export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_SCRATCH_DIR}/qa-assets} export CI_RETRY_EXE=${CI_RETRY_EXE:-"retry --"} diff --git a/doc/build-unix.md b/doc/build-unix.md index fe77e54fb7..61a66e1c1e 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -44,7 +44,7 @@ Finally, clang (often less resource hungry) can be used instead of gcc, which is Build requirements: - sudo apt-get install build-essential cmake pkg-config bsdmainutils python3 + sudo apt-get install build-essential cmake pkg-config python3 Now, you can either build from self-compiled [depends](#dependencies) or install the required dependencies: |