From 43c40dd80835fe9b5194ac5ee1a343e5d9efe3ad Mon Sep 17 00:00:00 2001 From: Max Edwards Date: Fri, 7 Jun 2024 23:28:04 +0100 Subject: ci: add IPV6 network to ci container Allows IPV6 functional tests to run inside the container Github-Pull: #30193 Rebased-From: 4b527fa93b9763a33842069bc07446313cbf5e0f --- ci/test/02_run_container.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/test/02_run_container.sh b/ci/test/02_run_container.sh index e6c4a61341..8de73f04d4 100755 --- a/ci/test/02_run_container.sh +++ b/ci/test/02_run_container.sh @@ -29,6 +29,8 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then docker volume create "${CONTAINER_NAME}_depends_SDKs_android" || true docker volume create "${CONTAINER_NAME}_previous_releases" || true + docker network create --ipv6 --subnet 1111:1111::/112 ci-ip6net || true + if [ -n "${RESTART_CI_DOCKER_BEFORE_RUN}" ] ; then echo "Restart docker before run to stop and clear all containers started with --rm" podman container rm --force --all # Similar to "systemctl restart docker" @@ -56,6 +58,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then --mount "type=volume,src=${CONTAINER_NAME}_previous_releases,dst=$PREVIOUS_RELEASES_DIR" \ --env-file /tmp/env-$USER-$CONTAINER_NAME \ --name "$CONTAINER_NAME" \ + --network ci-ip6net \ "$CONTAINER_NAME") export CI_CONTAINER_ID export CI_EXEC_CMD_PREFIX="docker exec ${CI_CONTAINER_ID}" -- cgit v1.2.3 From 0d524b14847f94d6e19413fde27f12e39e34694c Mon Sep 17 00:00:00 2001 From: Max Edwards Date: Fri, 7 Jun 2024 23:32:27 +0100 Subject: ci: move Asan / LSan / USDT job to Github Actions Moving it from Cirrus CI so it can be easier to maintain and used by forks Github-Pull: #30193 Rebased-From: 9eea51d9058ad638861aa4b94c1c6e71caeb8765 --- .cirrus.yml | 14 ------------- .github/workflows/ci.yml | 42 ++++++++++++++++++++++++++++++++++++- ci/test/00_setup_env_native_asan.sh | 6 ++++-- ci/test/02_run_container.sh | 2 ++ 4 files changed, 47 insertions(+), 17 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3c59e41a13..70fa76705e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -43,7 +43,6 @@ env: # Global defaults # The following specific types should exist, with the following requirements: # - small: For an x86_64 machine, recommended to have 2 CPUs and 8 GB of memory. # - medium: For an x86_64 machine, recommended to have 4 CPUs and 16 GB of memory. -# - noble: For a machine running the Linux kernel shipped with exaclty Ubuntu Noble 24.04. The machine is recommended to have 4 CPUs and 16 GB of memory. # - arm64: For an aarch64 machine, recommended to have 2 CPUs and 8 GB of memory. # https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks @@ -159,19 +158,6 @@ task: env: FILE_ENV: "./ci/test/00_setup_env_native_msan.sh" -task: - name: 'ASan + LSan + UBSan + integer, no depends, USDT' - enable_bpfcc_script: - # In the image build step, no external environment variables are available, - # so any settings will need to be written to the settings env file: - - sed -i "s|\${CIRRUS_CI}|true|g" ./ci/test/00_setup_env_native_asan.sh - << : *GLOBAL_TASK_TEMPLATE - persistent_worker: - labels: - type: noble # Must use this specific worker (needed for USDT functional tests) - env: - FILE_ENV: "./ci/test/00_setup_env_native_asan.sh" - task: name: 'fuzzer,address,undefined,integer, no depends' << : *GLOBAL_TASK_TEMPLATE diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ebeeb732d..aeba2975ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,6 @@ concurrency: cancel-in-progress: true env: - DANGER_RUN_CI_ON_HOST: 1 CI_FAILFAST_TEST_LEAVE_DANGLING: 1 # GHA does not care about dangling processes and setting this variable avoids killing the CI script itself on error MAKEJOBS: '-j10' @@ -81,6 +80,7 @@ jobs: timeout-minutes: 120 env: + DANGER_RUN_CI_ON_HOST: 1 FILE_ENV: './ci/test/00_setup_env_mac_native.sh' BASE_ROOT_DIR: ${{ github.workspace }} @@ -294,3 +294,43 @@ jobs: TEST_RUNNER_EXTRA: ${{ github.event_name != 'pull_request' && '--extended' || '' }} shell: cmd run: py -3 test\functional\test_runner.py --jobs %NUMBER_OF_PROCESSORS% --ci --quiet --tmpdirprefix=%RUNNER_TEMP% --combinedlogslen=99999999 --timeout-factor=%TEST_RUNNER_TIMEOUT_FACTOR% %TEST_RUNNER_EXTRA% + + asan-lsan-ubsan-integer-no-depends-usdt: + name: 'ASan + LSan + UBSan + integer, no depends, USDT' + runs-on: ubuntu-24.04 # has to match container in ci/test/00_setup_env_native_asan.sh for tracing tools + # No need to run on the read-only mirror, unless it is a PR. + if: github.repository != 'bitcoin-core/gui' || github.event_name == 'pull_request' + timeout-minutes: 120 + env: + FILE_ENV: "./ci/test/00_setup_env_native_asan.sh" + INSTALL_BCC_TRACING_TOOLS: true + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set Ccache directory + run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV" + + - name: Restore Ccache cache + id: ccache-cache + uses: actions/cache/restore@v4 + with: + path: ${{ env.CCACHE_DIR }} + key: ${{ github.job }}-ccache-${{ github.run_id }} + restore-keys: ${{ github.job }}-ccache- + + - name: Enable bpfcc script + # In the image build step, no external environment variables are available, + # so any settings will need to be written to the settings env file: + run: sed -i "s|\${INSTALL_BCC_TRACING_TOOLS}|true|g" ./ci/test/00_setup_env_native_asan.sh + + - name: CI script + run: ./ci/test_run_all.sh + + - name: Save Ccache cache + uses: actions/cache/save@v4 + if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true' + with: + path: ${{ env.CCACHE_DIR }} + # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache + key: ${{ github.job }}-ccache-${{ github.run_id }} diff --git a/ci/test/00_setup_env_native_asan.sh b/ci/test/00_setup_env_native_asan.sh index 60486f8f61..8f48ae025e 100755 --- a/ci/test/00_setup_env_native_asan.sh +++ b/ci/test/00_setup_env_native_asan.sh @@ -7,8 +7,10 @@ export LC_ALL=C.UTF-8 export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04" -# Only install BCC tracing packages in Cirrus CI. -if [[ "${CIRRUS_CI}" == "true" ]]; then + +# Only install BCC tracing packages in CI. Container has to match the host for BCC to work. +if [[ "${INSTALL_BCC_TRACING_TOOLS}" == "true" ]]; then + # Required for USDT functional tests to run BPFCC_PACKAGE="bpfcc-tools linux-headers-$(uname --kernel-release)" export CI_CONTAINER_CAP="--privileged -v /sys/kernel:/sys/kernel:rw" else diff --git a/ci/test/02_run_container.sh b/ci/test/02_run_container.sh index 8de73f04d4..5a8c65bc11 100755 --- a/ci/test/02_run_container.sh +++ b/ci/test/02_run_container.sh @@ -16,6 +16,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then # System-dependent env vars must be kept as is. So read them from the container. docker run --rm "${CI_IMAGE_NAME_TAG}" bash -c "env | grep --extended-regexp '^(HOME|PATH|USER)='" | tee --append "/tmp/env-$USER-$CONTAINER_NAME" echo "Creating $CI_IMAGE_NAME_TAG container to run in" + DOCKER_BUILDKIT=1 docker build \ --file "${BASE_READ_ONLY_DIR}/ci/test_imagefile" \ --build-arg "CI_IMAGE_NAME_TAG=${CI_IMAGE_NAME_TAG}" \ @@ -23,6 +24,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then --label="${CI_IMAGE_LABEL}" \ --tag="${CONTAINER_NAME}" \ "${BASE_READ_ONLY_DIR}" + docker volume create "${CONTAINER_NAME}_ccache" || true docker volume create "${CONTAINER_NAME}_depends" || true docker volume create "${CONTAINER_NAME}_depends_sources" || true -- cgit v1.2.3 From f34e44616d24ad19f87fced8216d5ff23e5a27c8 Mon Sep 17 00:00:00 2001 From: Max Edwards Date: Tue, 18 Jun 2024 10:16:30 +0100 Subject: ci: remove unused bcc variable from workflow Github-Pull: #30299 Rebased-From: 518b06c4b889d71a3fdd61f8fe38d519ea5e4a1b --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aeba2975ba..7859a721c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -303,7 +303,6 @@ jobs: timeout-minutes: 120 env: FILE_ENV: "./ci/test/00_setup_env_native_asan.sh" - INSTALL_BCC_TRACING_TOOLS: true steps: - name: Checkout uses: actions/checkout@v4 -- cgit v1.2.3 From 6338f92260523eaf7cd9c89300f4f088f9319b0d Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Thu, 13 Jun 2024 13:25:37 +0000 Subject: upnp: add compatibility for miniupnpc 2.2.8 See: https://github.com/miniupnp/miniupnp/commit/c0a50ce33e3b99ce8a96fd43049bb5b53ffac62f The return value of 2 now indicates: "A valid connected IGD has been found but its IP address is reserved (non routable)" We continue to ignore any return value other than 1. Github-Pull: #30283 Rebased-From: 8acdf66540834b9f9cf28f16d389e8b6a48516d5 --- src/mapport.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mapport.cpp b/src/mapport.cpp index 08b365db4b..f58d8ced15 100644 --- a/src/mapport.cpp +++ b/src/mapport.cpp @@ -163,8 +163,11 @@ static bool ProcessUpnp() struct UPNPUrls urls; struct IGDdatas data; int r; - +#if MINIUPNPC_API_VERSION <= 17 r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); +#else + r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), nullptr, 0); +#endif if (r == 1) { if (fDiscover) { -- cgit v1.2.3 From b3093eb755c00f0dc6c71d8384c9078603ef4862 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 19 Jun 2024 10:08:34 +0100 Subject: doc: Update rel notes for 27.x --- doc/release-notes.md | 67 ++++++---------------------------------------------- 1 file changed, 7 insertions(+), 60 deletions(-) diff --git a/doc/release-notes.md b/doc/release-notes.md index b19d70da33..e14001bf77 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,9 +1,9 @@ -27.1 Release Notes +27.x Release Notes ===================== -Bitcoin Core version 27.1 is now available from: +Bitcoin Core version 27.x is now available from: - + This release includes various bug fixes and performance improvements, as well as updated translations. @@ -40,75 +40,22 @@ unsupported systems. Notable changes =============== -### Miniscript - -- #29853 sign: don't assume we are parsing a sane TapMiniscript - -### RPC - -- #29869 rpc, bugfix: Enforce maximum value for setmocktime -- #29870 rpc: Reword SighashFromStr error message -- #30094 rpc: move UniValue in blockToJSON - -### Index - -- #29776 Fix #29767, set m_synced = true after Commit() - -### Gui - -- #gui812 Fix create unsigned transaction fee bump -- #gui813 Don't permit port in proxy IP option - -### Test - -- #29892 test: Fix failing univalue float test - -### P2P - -- #30085 p2p: detect addnode cjdns peers in GetAddedNodeInfo() - ### Build -- #29747 depends: fix mingw-w64 Qt DEBUG=1 build -- #29859 build: Fix false positive CHECK_ATOMIC test -- #29985 depends: Fix build of Qt for 32-bit platforms with recent glibc -- #30097 crypto: disable asan for sha256_sse4 with clang and -O0 -- #30151 depends: Fetch miniupnpc sources from an alternative website -- #30216 build: Fix building fuzz binary on on SunOS / illumos -- #30217 depends: Update Boost download link - -### Doc - -- #29934 doc: add LLVM instruction for macOS < 13 +- #30283 upnp: fix build with miniupnpc 2.2.8 ### CI -- #29856 ci: Bump s390x to ubuntu:24.04 - -### Misc - -- #29691 Change Luke Dashjr seed to dashjr-list-of-p2p-nodes.us -- #30149 contrib: Renew Windows code signing certificate +- #30193 ci: move ASan job to GitHub Actions from Cirrus CI +- #30299 ci: remove unused bcc variable from workflow Credits ======= Thanks to everyone who directly contributed to this release: -- Antoine Poinsot -- Ava Chow - Cory Fields -- dergoegge -- fanquake -- furszy -- Hennadii Stepanov -- Jon Atack -- laanwj -- Luke Dashjr -- MarcoFalke -- nanlour -- Sjors Provoost -- willcl-ark +- Max Edwards As well as to everyone that helped with translations on [Transifex](https://www.transifex.com/bitcoin/bitcoin/). -- cgit v1.2.3