Skip to content

Commit 712472a

Browse files
PastaPastaPastaPastaPastaPasta
committed
Merge branch 'develop' of https://github.com/dashpay/dash into develop
2 parents 1de633c + 794d346 commit 712472a

15 files changed

+354
-272
lines changed

‎.dockerignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
**
2-
!contrib/containers/ci/Dockerfile
2+
!contrib/containers/ci/ci.Dockerfile
3+
!contrib/containers/ci/ci-slim.Dockerfile
34
!contrib/containers/deploy/Dockerfile
45
!contrib/containers/develop/Dockerfile

‎.github/workflows/build-container.yml

+22-9
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,23 @@ name: Build container
22

33
on:
44
workflow_call:
5+
inputs:
6+
context:
7+
description: "Path to use for build context"
8+
required: true
9+
type: string
10+
file:
11+
description: "Path to Dockerfile"
12+
required: true
13+
type: string
14+
name:
15+
description: "Container name"
16+
required: true
17+
type: string
518
outputs:
619
path:
720
description: "Path to built container"
8-
value: ghcr.io/${{ jobs.build.outputs.repo }}/dashcore-ci-runner:${{ jobs.build.outputs.tag }}
21+
value: ghcr.io/${{ jobs.build.outputs.repo }}/${{ inputs.name }}:${{ jobs.build.outputs.tag }}
922

1023
env:
1124
DOCKER_DRIVER: overlay2
@@ -44,15 +57,15 @@ jobs:
4457
- name: Build and push Docker image
4558
uses: docker/build-push-action@v6
4659
with:
47-
context: ./contrib/containers/ci
48-
file: ./contrib/containers/ci/Dockerfile
60+
context: ${{ inputs.context }}
61+
file: ${{ inputs.file }}
4962
push: true
5063
tags: |
51-
ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ hashFiles('./contrib/containers/ci/Dockerfile') }}
52-
ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ steps.prepare.outputs.tag }}
53-
ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:latest
64+
ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:${{ hashFiles(inputs.file) }}
65+
ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:${{ steps.prepare.outputs.tag }}
66+
ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:latest
5467
cache-from: |
55-
type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ hashFiles('./contrib/containers/ci/Dockerfile') }}
56-
type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:${{ steps.prepare.outputs.tag }}
57-
type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/dashcore-ci-runner:latest
68+
type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:${{ hashFiles(inputs.file) }}
69+
type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:${{ steps.prepare.outputs.tag }}
70+
type=registry,ref=ghcr.io/${{ steps.prepare.outputs.repo }}/${{ inputs.name }}:latest
5871
cache-to: type=inline

‎.github/workflows/build-depends.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ jobs:
7070
path: |
7171
depends/built
7272
depends/${{ steps.setup.outputs.HOST }}
73-
key: depends-${{ hashFiles('contrib/containers/ci/Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-${{ hashFiles('depends/packages/*') }}
73+
key: depends-${{ hashFiles('contrib/containers/ci/ci.Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-${{ hashFiles('depends/packages/*') }}
7474
restore-keys: |
75-
depends-${{ hashFiles('contrib/containers/ci/Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-
76-
depends-${{ hashFiles('contrib/containers/ci/Dockerfile') }}-${{ inputs.build-target }}-
75+
depends-${{ hashFiles('contrib/containers/ci/ci.Dockerfile') }}-${{ inputs.build-target }}-${{ steps.setup.outputs.DEP_HASH }}-
76+
depends-${{ hashFiles('contrib/containers/ci/ci.Dockerfile') }}-${{ inputs.build-target }}-
7777
7878
- name: Build depends
7979
run: |

‎.github/workflows/build-src.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ jobs:
7070
with:
7171
path: |
7272
/cache
73-
key: ccache-${{ hashFiles('contrib/containers/ci/Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-${{ github.sha }}
73+
key: ccache-${{ hashFiles('contrib/containers/ci/ci.Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-${{ github.sha }}
7474
restore-keys: |
75-
ccache-${{ hashFiles('contrib/containers/ci/Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-
75+
ccache-${{ hashFiles('contrib/containers/ci/ci.Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-
7676
7777
- name: Build source
7878
run: |
@@ -87,6 +87,14 @@ jobs:
8787
ccache -c
8888
shell: bash
8989

90+
- name: Run linters
91+
if: inputs.build-target == 'linux64_multiprocess'
92+
run: |
93+
export BUILD_TARGET="${{ inputs.build-target }}"
94+
source ./ci/dash/matrix.sh
95+
./ci/dash/lint-tidy.sh
96+
shell: bash
97+
9098
- name: Run unit tests
9199
run: |
92100
BASE_OUTDIR="/output"

‎.github/workflows/build.yml

+38-8
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@ jobs:
1616
container:
1717
name: Build container
1818
uses: ./.github/workflows/build-container.yml
19+
with:
20+
context: ./contrib/containers/ci
21+
file: ./contrib/containers/ci/ci.Dockerfile
22+
name: dashcore-ci-runner
23+
24+
container-slim:
25+
name: Build slim container
26+
uses: ./.github/workflows/build-container.yml
27+
with:
28+
context: ./contrib/containers/ci
29+
file: ./contrib/containers/ci/ci-slim.Dockerfile
30+
name: dashcore-ci-slim
1931

2032
depends-arm-linux:
2133
name: arm-linux-gnueabihf
@@ -158,35 +170,53 @@ jobs:
158170
test-linux64:
159171
name: linux64-test
160172
uses: ./.github/workflows/test-src.yml
161-
needs: [container, src-linux64]
173+
needs: [container-slim, src-linux64]
162174
with:
163175
bundle-key: ${{ needs.src-linux64.outputs.key }}
164176
build-target: linux64
165-
container-path: ${{ needs.container.outputs.path }}
177+
container-path: ${{ needs.container-slim.outputs.path }}
178+
179+
test-linux64_multiprocess:
180+
name: linux64_multiprocess-test
181+
uses: ./.github/workflows/test-src.yml
182+
needs: [container-slim, src-linux64_multiprocess]
183+
with:
184+
bundle-key: ${{ needs.src-linux64_multiprocess.outputs.key }}
185+
build-target: linux64_multiprocess
186+
container-path: ${{ needs.container-slim.outputs.path }}
166187

167188
test-linux64_nowallet:
168189
name: linux64_nowallet-test
169190
uses: ./.github/workflows/test-src.yml
170-
needs: [container, src-linux64_nowallet]
191+
needs: [container-slim, src-linux64_nowallet]
171192
with:
172193
bundle-key: ${{ needs.src-linux64_nowallet.outputs.key }}
173194
build-target: linux64_nowallet
174-
container-path: ${{ needs.container.outputs.path }}
195+
container-path: ${{ needs.container-slim.outputs.path }}
175196

176197
test-linux64_sqlite:
177198
name: linux64_sqlite-test
178199
uses: ./.github/workflows/test-src.yml
179-
needs: [container, src-linux64_sqlite]
200+
needs: [container-slim, src-linux64_sqlite]
180201
with:
181202
bundle-key: ${{ needs.src-linux64_sqlite.outputs.key }}
182203
build-target: linux64_sqlite
183-
container-path: ${{ needs.container.outputs.path }}
204+
container-path: ${{ needs.container-slim.outputs.path }}
205+
206+
test-linux64_tsan:
207+
name: linux64_tsan-test
208+
uses: ./.github/workflows/test-src.yml
209+
needs: [container-slim, src-linux64_tsan]
210+
with:
211+
bundle-key: ${{ needs.src-linux64_tsan.outputs.key }}
212+
build-target: linux64_tsan
213+
container-path: ${{ needs.container-slim.outputs.path }}
184214

185215
test-linux64_ubsan:
186216
name: linux64_ubsan-test
187217
uses: ./.github/workflows/test-src.yml
188-
needs: [container, src-linux64_ubsan]
218+
needs: [container-slim, src-linux64_ubsan]
189219
with:
190220
bundle-key: ${{ needs.src-linux64_ubsan.outputs.key }}
191221
build-target: linux64_ubsan
192-
container-path: ${{ needs.container.outputs.path }}
222+
container-path: ${{ needs.container-slim.outputs.path }}

‎.gitlab-ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ builder-image:
2929
- echo $CI_JOB_TOKEN | docker login -u gitlab-ci-token --password-stdin $CI_REGISTRY
3030
script:
3131
- cd contrib/containers/ci
32+
- export DOCKER_BUILDKIT=1
3233
- docker pull $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG || true
3334
- docker pull $CI_REGISTRY_IMAGE:builder-develop || true
34-
- docker build --cache-from $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG --cache-from $CI_REGISTRY_IMAGE:builder-develop -t $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG -f Dockerfile .
35+
- docker build --cache-from $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG --cache-from $CI_REGISTRY_IMAGE:builder-develop -t $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG -f ci.Dockerfile .
3536
- docker push $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG
3637

3738
.build-depends-template:
@@ -56,7 +57,7 @@ builder-image:
5657
# Let all branches share the same cache, which is ok because the depends subsystem is able to handle this properly (it works with hashes of all scripts)
5758
key:
5859
files:
59-
- contrib/containers/ci/Dockerfile
60+
- contrib/containers/ci/ci.Dockerfile
6061
prefix: ${CI_JOB_NAME}
6162
paths:
6263
- depends/built
@@ -116,7 +117,7 @@ builder-image:
116117
# Let all branches share the same cache, which is ok because ccache is able to handle it
117118
key:
118119
files:
119-
- contrib/containers/ci/Dockerfile
120+
- contrib/containers/ci/ci.Dockerfile
120121
prefix: ${CI_JOB_NAME}
121122
paths:
122123
- cache/ccache

‎ci/dash/build_src.sh

+7-18
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ set -e
1111

1212
source ./ci/dash/matrix.sh
1313

14-
unset CC; unset CXX
15-
unset DISPLAY
14+
unset CC CXX DISPLAY;
1615

1716
if [ "$PULL_REQUEST" != "false" ]; then test/lint/commit-script-check.sh "$COMMIT_RANGE"; fi
1817

@@ -51,6 +50,8 @@ make distdir VERSION="$BUILD_TARGET"
5150
cd "dashcore-$BUILD_TARGET"
5251
bash -c "./configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( cat config.log && false)
5352

53+
# This step influences compilation and therefore will always be a part of the
54+
# compile step
5455
if [ "${RUN_TIDY}" = "true" ]; then
5556
MAYBE_BEAR="bear --config src/.bear-tidy-config"
5657
MAYBE_TOKEN="--"
@@ -65,22 +66,10 @@ if [ -n "$USE_VALGRIND" ]; then
6566
"${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh"
6667
fi
6768

68-
if [ "${RUN_TIDY}" = "true" ]; then
69-
set -eo pipefail
70-
cd src
71-
( run-clang-tidy -quiet "${MAKEJOBS}" ) | grep -C5 "error"
72-
cd ..
73-
iwyu_tool.py \
74-
"src/compat" \
75-
"src/init" \
76-
"src/rpc/fees.cpp" \
77-
"src/rpc/signmessage.cpp" \
78-
-p . "${MAKEJOBS}" \
79-
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_ROOT_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
80-
|& tee "/tmp/iwyu_ci.out"
81-
cd src
82-
fix_includes.py --nosafe_headers < /tmp/iwyu_ci.out
83-
git --no-pager diff
69+
# GitHub Actions can segment a job into steps, linting is a separate step
70+
# so Actions runners will perform this step separately.
71+
if [ "${RUN_TIDY}" = "true" ] && [ "${GITHUB_ACTIONS}" != "true" ]; then
72+
"${BASE_ROOT_DIR}/ci/dash/lint-tidy.sh"
8473
fi
8574

8675
if [ "$RUN_SECURITY_TESTS" = "true" ]; then

‎ci/dash/lint-tidy.sh

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/usr/bin/env bash
2+
# Copyright (c) 2025 The Dash Core developers
3+
# Distributed under the MIT software license, see the accompanying
4+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
5+
6+
export LC_ALL=C.UTF-8
7+
8+
set -eo pipefail
9+
10+
# Warning: This script does not generate the compilation database these linters rely
11+
# only on nor do they set the requisite build parameters. Make sure you do
12+
# that *before* running this script.
13+
14+
cd "${BASE_ROOT_DIR}/build-ci/dashcore-${BUILD_TARGET}/src"
15+
( run-clang-tidy -quiet "${MAKEJOBS}" ) | grep -C5 "error"
16+
17+
cd "${BASE_ROOT_DIR}/build-ci/dashcore-${BUILD_TARGET}"
18+
iwyu_tool.py \
19+
"src/compat" \
20+
"src/init" \
21+
"src/rpc/fees.cpp" \
22+
"src/rpc/signmessage.cpp" \
23+
-p . "${MAKEJOBS}" \
24+
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_ROOT_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
25+
2>&1 | tee "/tmp/iwyu_ci.out"
26+
27+
cd "${BASE_ROOT_DIR}/build-ci/dashcore-${BUILD_TARGET}/src"
28+
fix_includes.py --nosafe_headers < /tmp/iwyu_ci.out
29+
git --no-pager diff

‎ci/dash/slim-workspace.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TARGETS=(
3232
"build-ci/dashcore-${BUILD_TARGET}/src/qt/qrc_dash_locale.cpp"
3333
)
3434

35-
# Delete directories we don't need
35+
# Delete what we don't need
3636
for target in "${TARGETS[@]}"
3737
do
3838
if [[ -d "${target}" ]] || [[ -f "${target}" ]]; then

‎ci/dash/test_integrationtests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if [ "$BASEDIR" != "" ]; then
6666
for f in $LOGFILES; do
6767
d2="testlogs/$d/$(dirname "$f")"
6868
mkdir -p "$d2"
69-
cp "testdatadirs/$BASEDIR/$d/$f" "$d2/"
69+
mv "testdatadirs/$BASEDIR/$d/$f" "$d2/"
7070
done
7171
done
7272
fi

‎contrib/containers/README.md

+16-10
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
## Containers
22

3-
This directory contains configuration files for containerization utilities.
3+
This directory contains configuration files for containers. Containers that depends on other containers require BuildKit to
4+
be enabled in order for syntax extensions to work correctly.
45

5-
Currently two Docker containers exist, `ci` defines how Dash's GitLab CI container is built and the `dev` builds on top of the `ci` to provide a containerized development environment that is as close as possible to CI for contributors! See also [Dash on Docker Hub](https://hub.docker.com/u/dashpay) i.e. for the [dashd container](https://hub.docker.com/r/dashpay/dashd).
6+
| Name | Depends On | Purpose |
7+
| --------- | -----------| -------------------------------------------------------------------------- |
8+
| `ci-slim` | None | Slimmed down container used to run functional tests and (some) linters |
9+
| `ci` | `ci-slim` | Full container used to (cross) compile |
10+
| `develop` | `ci` | Interactive environment to allow debugging in an environment that's 1:1 CI |
11+
| `deploy` | None | Packaging of builds for release on Docker Hub |
12+
| `guix` | None | Interactive environment for building (and packaging) with Guix |
613

714
### Usage Guide
815

9-
We utilise edrevo's [dockerfile-plus](https://github.com/edrevo/dockerfile-plus), a syntax extension that
10-
leverages Docker [BuildKit](https://docs.docker.com/develop/develop-images/build_enhancements/) to reduce
16+
We utilise edrevo's [devthefuture/dockerfile-x](https://codeberg.org/devthefuture/dockerfile-x), a syntax extension that
17+
leverages Docker [BuildKit](https://docs.docker.com/build/buildkit/) to reduce
1118
the amount of repetitive code.
1219

13-
As BuildKit is opt-in within many currently supported versions of Docker (as of this writing), you need to
14-
set the following environment variables before continuing. While not needed after the initial `docker compose build`
15-
(barring updates to the `Dockerfile`), we recommend placing this in your `~/.bash_profile`/`~/.zshrc` or equivalent
20+
As BuildKit is opt-in within some versions of Docker, you may need to set the following environment variables before
21+
continuing. While not needed after the initial `docker compose build` (barring updates to the `Dockerfile`), we
22+
recommend placing this in your `~/.bash_profile`/`~/.zshrc` or equivalent
1623

1724
```bash
1825
export DOCKER_BUILDKIT=1
1926
export COMPOSE_DOCKER_CLI_BUILD=1
2027
```
2128

22-
After that, it's simply a matter of building and running your own development container. You can use extensions
23-
for your IDE like Visual Studio Code's [Remote Containers](https://code.visualstudio.com/docs/remote/containers)
24-
to run terminal commands from inside the terminal and build Dash Core.
29+
You can use extensions for your IDE like Visual Studio Code's [Remote Containers](https://code.visualstudio.com/docs/remote/containers)
30+
to run terminal commands from inside the terminal and work with Dash Core.
2531

2632
```bash
2733
cd contrib/containers/develop

0 commit comments

Comments
 (0)