Skip to content

Commit 31f3032

Browse files
PastaPastaPastaPastaPastaPasta
committed
Merge branch 'develop' of https://github.com/dashpay/dash into develop
2 parents 712472a + dbfdcc5 commit 31f3032

26 files changed

+259
-79
lines changed

‎.github/workflows/build.yml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ permissions:
1010

1111
env:
1212
DOCKER_DRIVER: overlay2
13-
FAST_MODE: false
1413

1514
jobs:
1615
container:
@@ -33,6 +32,7 @@ jobs:
3332
name: arm-linux-gnueabihf
3433
uses: ./.github/workflows/build-depends.yml
3534
needs: [container]
35+
if: ${{ vars.SKIP_ARM_LINUX == '' }}
3636
with:
3737
build-target: arm-linux
3838
container-path: ${{ needs.container.outputs.path }}
@@ -41,6 +41,11 @@ jobs:
4141
name: x86_64-pc-linux-gnu
4242
uses: ./.github/workflows/build-depends.yml
4343
needs: [container]
44+
if: |
45+
vars.SKIP_LINUX64 == '' ||
46+
vars.SKIP_LINUX64_FUZZ == '' ||
47+
vars.SKIP_LINUX64_SQLITE == '' ||
48+
vars.SKIP_LINUX64_UBSAN == ''
4449
with:
4550
build-target: linux64
4651
container-path: ${{ needs.container.outputs.path }}
@@ -49,6 +54,9 @@ jobs:
4954
name: x86_64-pc-linux-gnu_multiprocess
5055
uses: ./.github/workflows/build-depends.yml
5156
needs: [container]
57+
if: |
58+
vars.SKIP_LINUX64_MULTIPROCESS == '' ||
59+
vars.SKIP_LINUX64_TSAN == ''
5260
with:
5361
build-target: linux64_multiprocess
5462
container-path: ${{ needs.container.outputs.path }}
@@ -57,6 +65,7 @@ jobs:
5765
name: x86_64-pc-linux-gnu_nowallet
5866
uses: ./.github/workflows/build-depends.yml
5967
needs: [container]
68+
if: ${{ vars.SKIP_LINUX64_NOWALLET == '' }}
6069
with:
6170
build-target: linux64_nowallet
6271
container-path: ${{ needs.container.outputs.path }}
@@ -65,6 +74,7 @@ jobs:
6574
name: x86_64-apple-darwin
6675
uses: ./.github/workflows/build-depends.yml
6776
needs: [container]
77+
if: ${{ vars.SKIP_MAC == '' }}
6878
with:
6979
build-target: mac
7080
container-path: ${{ needs.container.outputs.path }}
@@ -73,6 +83,7 @@ jobs:
7383
name: x86_64-w64-mingw32
7484
uses: ./.github/workflows/build-depends.yml
7585
needs: [container]
86+
if: ${{ vars.SKIP_WIN64 == '' }}
7687
with:
7788
build-target: win64
7889
container-path: ${{ needs.container.outputs.path }}
@@ -90,6 +101,7 @@ jobs:
90101
name: linux64-build
91102
uses: ./.github/workflows/build-src.yml
92103
needs: [container, depends-linux64]
104+
if: ${{ vars.SKIP_LINUX64 == '' }}
93105
with:
94106
build-target: linux64
95107
container-path: ${{ needs.container.outputs.path }}
@@ -99,6 +111,7 @@ jobs:
99111
name: linux64_fuzz-build
100112
uses: ./.github/workflows/build-src.yml
101113
needs: [container, depends-linux64]
114+
if: ${{ vars.SKIP_LINUX64_FUZZ == '' }}
102115
with:
103116
build-target: linux64_fuzz
104117
container-path: ${{ needs.container.outputs.path }}
@@ -108,6 +121,7 @@ jobs:
108121
name: linux64_multiprocess-build
109122
uses: ./.github/workflows/build-src.yml
110123
needs: [container, depends-linux64_multiprocess]
124+
if: ${{ vars.SKIP_LINUX64_MULTIPROCESS == '' }}
111125
with:
112126
build-target: linux64_multiprocess
113127
container-path: ${{ needs.container.outputs.path }}
@@ -126,6 +140,7 @@ jobs:
126140
name: linux64_sqlite-build
127141
uses: ./.github/workflows/build-src.yml
128142
needs: [container, depends-linux64]
143+
if: ${{ vars.SKIP_LINUX64_SQLITE == '' }}
129144
with:
130145
build-target: linux64_sqlite
131146
container-path: ${{ needs.container.outputs.path }}
@@ -135,6 +150,7 @@ jobs:
135150
name: linux64_tsan-build
136151
uses: ./.github/workflows/build-src.yml
137152
needs: [container, depends-linux64_multiprocess]
153+
if: ${{ vars.SKIP_LINUX64_TSAN == '' }}
138154
with:
139155
build-target: linux64_tsan
140156
container-path: ${{ needs.container.outputs.path }}
@@ -144,6 +160,7 @@ jobs:
144160
name: linux64_ubsan-build
145161
uses: ./.github/workflows/build-src.yml
146162
needs: [container, depends-linux64]
163+
if: ${{ vars.SKIP_LINUX64_UBSAN == '' }}
147164
with:
148165
build-target: linux64_ubsan
149166
container-path: ${{ needs.container.outputs.path }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ build-aux/test-driver
3939
config.cache
4040
config.log
4141
config.status
42+
config.status.old
4243
configure
4344
libtool
4445
src/config/bitcoin-config.h

‎.gitlab-ci.yml‎

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@ image: "ubuntu:noble"
22

33
variables:
44
DOCKER_DRIVER: overlay2
5-
FAST_MODE: "false" # when "true", only run linter on arm and unit/functional tests on linux64, skip everything else
65
CI_FAILFAST_TEST_LEAVE_DANGLING: "1" # Gitlab CI does not care about dangling process and setting this variable avoids killing the CI script itself on error
6+
# BUILD_TARGETS: '/^(arm-linux|linux64|linux64_fuzz|linux64_multiprocess|linux64_nowallet|linux64_sqlite|linux64_tsan|linux64_ubsan|mac|win64)$/'
7+
# Set BUILD_TARGETS variable in Gitlab CI/CD settings using the template above excluding the build targets you don't need.
8+
# For example, the old FAST_MODE would be '/^(arm-linux|linux64)$/'.
9+
# If BUILD_TARGETS is not set or it's an empty string then no filtering is applied.
10+
# NOTE: "Value" MUST be wrapped in '' i.e. it should be '/reg_exp/' ('' included) and not /reg_exp/ (no '').
711

812
workflow:
913
rules:
@@ -38,13 +42,16 @@ builder-image:
3842
.build-depends-template:
3943
stage: build-depends
4044
rules:
41-
- when: on_success
45+
- if: '$BUILD_TARGETS == null || $BUILD_TARGETS == "" || $BUILD_TARGET =~ $BUILD_TARGETS'
46+
when: on_success
47+
- when: never
4248
needs:
4349
- builder-image
4450
image: $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG
4551
before_script:
4652
- |
4753
echo BUILD_TARGET="${BUILD_TARGET}"
54+
echo BUILD_TARGETS="${BUILD_TARGETS}"
4855
source ./ci/dash/matrix.sh
4956
echo HOST="${HOST}"
5057
echo DEP_OPTS="${DEP_OPTS}"
@@ -72,10 +79,13 @@ builder-image:
7279
.base-template:
7380
image: $CI_REGISTRY_IMAGE:builder-$CI_COMMIT_REF_SLUG
7481
rules:
75-
- when: on_success
82+
- if: '$BUILD_TARGETS == null || $BUILD_TARGETS == "" || $BUILD_TARGET =~ $BUILD_TARGETS'
83+
when: on_success
84+
- when: never
7685
before_script:
7786
- export CACHE_DIR=$CI_PROJECT_DIR/cache
7887
- echo BUILD_TARGET=$BUILD_TARGET
88+
- echo BUILD_TARGETS="${BUILD_TARGETS}"
7989
- source ./ci/dash/matrix.sh
8090
- echo HOST=${HOST}
8191
- echo DEP_OPTS=${DEP_OPTS}
@@ -165,12 +175,6 @@ builder-image:
165175
- testlogs
166176
expire_in: 3 days
167177

168-
.skip-in-fast-mode-template:
169-
rules:
170-
- if: '$FAST_MODE == "true"'
171-
when: never
172-
- when: on_success
173-
174178
###
175179

176180
arm-linux-gnueabihf:
@@ -181,7 +185,6 @@ arm-linux-gnueabihf:
181185
x86_64-w64-mingw32:
182186
extends:
183187
- .build-depends-template
184-
- .skip-in-fast-mode-template
185188
variables:
186189
BUILD_TARGET: win64
187190

@@ -193,21 +196,18 @@ x86_64-pc-linux-gnu:
193196
x86_64-pc-linux-gnu_nowallet:
194197
extends:
195198
- .build-depends-template
196-
- .skip-in-fast-mode-template
197199
variables:
198200
BUILD_TARGET: linux64_nowallet
199201

200202
x86_64-pc-linux-gnu_multiprocess:
201203
extends:
202204
- .build-depends-template
203-
- .skip-in-fast-mode-template
204205
variables:
205206
BUILD_TARGET: linux64_multiprocess
206207

207208
x86_64-apple-darwin:
208209
extends:
209210
- .build-depends-template
210-
- .skip-in-fast-mode-template
211211
variables:
212212
BUILD_TARGET: mac
213213

@@ -223,7 +223,6 @@ arm-linux-build:
223223
win64-build:
224224
extends:
225225
- .build-template
226-
- .skip-in-fast-mode-template
227226
needs:
228227
- x86_64-w64-mingw32
229228
variables:
@@ -239,7 +238,6 @@ linux64-build:
239238
linux64_sqlite-build:
240239
extends:
241240
- .build-template
242-
- .skip-in-fast-mode-template
243241
needs:
244242
- x86_64-pc-linux-gnu
245243
variables:
@@ -248,7 +246,6 @@ linux64_sqlite-build:
248246
linux64_fuzz-build:
249247
extends:
250248
- .build-template
251-
- .skip-in-fast-mode-template
252249
needs:
253250
- x86_64-pc-linux-gnu
254251
variables:
@@ -257,7 +254,6 @@ linux64_fuzz-build:
257254
#linux64_asan-build:
258255
# extends:
259256
# - .build-template
260-
# - .skip-in-fast-mode-template
261257
# needs:
262258
# - x86_64-pc-linux-gnu
263259
# variables:
@@ -266,7 +262,6 @@ linux64_fuzz-build:
266262
linux64_tsan-build:
267263
extends:
268264
- .build-template
269-
- .skip-in-fast-mode-template
270265
needs:
271266
- x86_64-pc-linux-gnu_multiprocess
272267
variables:
@@ -275,7 +270,6 @@ linux64_tsan-build:
275270
linux64_ubsan-build:
276271
extends:
277272
- .build-template
278-
- .skip-in-fast-mode-template
279273
needs:
280274
- x86_64-pc-linux-gnu
281275
variables:
@@ -284,7 +278,6 @@ linux64_ubsan-build:
284278
linux64_nowallet-build:
285279
extends:
286280
- .build-template
287-
- .skip-in-fast-mode-template
288281
needs:
289282
- x86_64-pc-linux-gnu_nowallet
290283
variables:
@@ -293,7 +286,6 @@ linux64_nowallet-build:
293286
linux64_multiprocess-build:
294287
extends:
295288
- .build-template
296-
- .skip-in-fast-mode-template
297289
needs:
298290
- x86_64-pc-linux-gnu_multiprocess
299291
variables:
@@ -302,7 +294,6 @@ linux64_multiprocess-build:
302294
#linux64_valgrind-build:
303295
# extends:
304296
# - .build-template
305-
# - .skip-in-fast-mode-template
306297
# needs:
307298
# - x86_64-pc-linux-gnu
308299
# variables:
@@ -311,7 +302,6 @@ linux64_multiprocess-build:
311302
mac-build:
312303
extends:
313304
- .build-template
314-
- .skip-in-fast-mode-template
315305
needs:
316306
- x86_64-apple-darwin
317307
variables:
@@ -329,7 +319,6 @@ linux64-test:
329319
linux64_sqlite-test:
330320
extends:
331321
- .test-template
332-
- .skip-in-fast-mode-template
333322
needs:
334323
- linux64_sqlite-build
335324
variables:
@@ -338,7 +327,6 @@ linux64_sqlite-test:
338327
#linux64_asan-test:
339328
# extends:
340329
# - .test-template
341-
# - .skip-in-fast-mode-template
342330
# needs:
343331
# - linux64_asan-build
344332
# variables:
@@ -347,7 +335,6 @@ linux64_sqlite-test:
347335
linux64_tsan-test:
348336
extends:
349337
- .test-template
350-
- .skip-in-fast-mode-template
351338
needs:
352339
- linux64_tsan-build
353340
variables:
@@ -356,7 +343,6 @@ linux64_tsan-test:
356343
linux64_ubsan-test:
357344
extends:
358345
- .test-template
359-
- .skip-in-fast-mode-template
360346
needs:
361347
- linux64_ubsan-build
362348
variables:
@@ -365,7 +351,6 @@ linux64_ubsan-test:
365351
linux64_multiprocess-test:
366352
extends:
367353
- .test-template
368-
- .skip-in-fast-mode-template
369354
needs:
370355
- linux64_multiprocess-build
371356
variables:
@@ -374,7 +359,6 @@ linux64_multiprocess-test:
374359
linux64_nowallet-test:
375360
extends:
376361
- .test-template
377-
- .skip-in-fast-mode-template
378362
needs:
379363
- linux64_nowallet-build
380364
variables:
@@ -383,7 +367,6 @@ linux64_nowallet-test:
383367
#linux64_valgrind-test:
384368
# extends:
385369
# - .test-template
386-
# - .skip-in-fast-mode-template
387370
# needs:
388371
# - linux64_valgrind-build
389372
# variables:

‎depends/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ include packages/packages.mk
144144
# 2. Before including packages/*.mk (excluding packages/packages.mk), since
145145
# they rely on the build_id variables
146146
#
147-
build_id:=$(shell env CC='$(build_CC)' CXX='$(build_CXX)' AR='$(build_AR)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
148-
$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' CXX='$(host_CXX)' AR='$(host_AR)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
147+
build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(build_AR)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
148+
$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(host_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(host_AR)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
149149

150150
qrencode_packages_$(NO_QR) = $(qrencode_$(host_os)_packages)
151151

‎depends/gen_id‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env bash
22

3-
# Usage: env [ CC=... ] [ CXX=... ] [ AR=... ] [ RANLIB=... ] [ STRIP=... ] \
4-
# [ DEBUG=... ] [ LTO=... ] ./build-id [ID_SALT]...
3+
# Usage: env [ CC=... ] [ C_STANDARD=...] [ CXX=... ] [CXX_STANDARD=...] \
4+
# [ AR=... ] [ RANLIB=... ] [ STRIP=... ] [ DEBUG=... ] \
5+
# [ LTO=... ] ./build-id [ID_SALT]...
56
#
67
# Prints to stdout a SHA256 hash representing the current toolset, used by
78
# depends/Makefile as a build id for caching purposes (detecting when the
@@ -39,12 +40,14 @@
3940
bash -c "${CC} -v"
4041
bash -c "${CC} -v -E -xc -o /dev/null - < /dev/null"
4142
bash -c "${CC} -v -E -xobjective-c -o /dev/null - < /dev/null"
43+
echo "C_STANDARD=${C_STANDARD}"
4244
echo "END CC"
4345

4446
echo "BEGIN CXX"
4547
bash -c "${CXX} -v"
4648
bash -c "${CXX} -v -E -xc++ -o /dev/null - < /dev/null"
4749
bash -c "${CXX} -v -E -xobjective-c++ -o /dev/null - < /dev/null"
50+
echo "CXX_STANDARD=${CXX_STANDARD}"
4851
echo "END CXX"
4952

5053
echo "BEGIN AR"

‎src/Makefile.test.include‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ BITCOIN_TESTS =\
111111
test/dynamic_activation_thresholds_tests.cpp \
112112
test/evo_assetlocks_tests.cpp \
113113
test/evo_deterministicmns_tests.cpp \
114+
test/evo_islock_tests.cpp \
114115
test/evo_mnhf_tests.cpp \
115116
test/evo_simplifiedmns_tests.cpp \
116117
test/evo_trivialvalidation.cpp \

0 commit comments

Comments
 (0)