Skip to content

Commit a6ee725

Browse files
PastaPastaPastaPastaPastaPasta
committed
Merge #6432: [v22.0.x] backport: release v22.0.0-rc2
8b88ff7 Merge #6414: chore: bump seeds for v22 (pasta) 02ad523 Merge #6411: chore: update nMinimumChainWork, defaultAssumeValid, checkpointData, chainTxData for mainnet and testnet (pasta) 3bbcd3d Merge #6393: docs: mention building for some HOSTs only in `release-process.md` (pasta) 18f636f Merge #6426: fix: respect SENDDSQUEUE message, move DSQ relay into net processing / peerman (pasta) 9fed456 Merge #6407: fix: dataraces (pasta) 86105da Merge #6408: refactor: removed pre-MN_RR logic of validation of CL (pasta) a1f7e96 Merge #6406: ci: use `actions/cache` to manage depends cache (pasta) 90a3807 Merge #6402: ci: cache built (pasta) 66f6787 Merge #6401: ci: deduplicate depends building (pasta) 7ca5663 Merge #6397: ci: add powerpc64 to GH Guix job matrix (pasta) Pull request description: ## What was done? See commits for each particular change ## How Has This Been Tested? To be deployed on testnet ## Breaking Changes N/A ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 8b88ff7 PastaPastaPasta: utACK 8b88ff7 Tree-SHA512: f7fac62996873503e7de875cc96d9cdf5675674345f1bb1df4a16bf19bddc17bc395a80cc761363a0121022d42c46fb313b0973b9cc71f568ef55c6b3d9e29d8
2 parents 9bfb700 + 8b88ff7 commit a6ee725

19 files changed

+498
-333
lines changed

‎.github/workflows/build.yml

+14-51
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
with:
2626
ref: ${{ github.event.pull_request.head.sha }}
2727

28-
2928
- name: Prepare
3029
id: prepare
3130
run: |
@@ -68,18 +67,6 @@ jobs:
6867
host: arm-linux-gnueabihf
6968
- build_target: linux64
7069
host: x86_64-pc-linux-gnu
71-
- build_target: linux64_tsan
72-
host: x86_64-pc-linux-gnu
73-
- build_target: linux64_ubsan
74-
host: x86_64-pc-linux-gnu
75-
- build_target: linux64_fuzz
76-
host: x86_64-pc-linux-gnu
77-
- build_target: linux64_cxx20
78-
host: x86_64-pc-linux-gnu
79-
- build_target: linux64_sqlite
80-
host: x86_64-pc-linux-gnu
81-
- build_target: linux64_nowallet
82-
host: x86_64-pc-linux-gnu
8370

8471
container:
8572
image: ghcr.io/${{ needs.build-image.outputs.repo-name }}/dashcore-ci-runner:${{ needs.build-image.outputs.image-tag }}
@@ -90,7 +77,6 @@ jobs:
9077
with:
9178
ref: ${{ github.event.pull_request.head.sha }}
9279

93-
9480
- name: Cache depends sources
9581
uses: actions/cache@v4
9682
with:
@@ -100,17 +86,18 @@ jobs:
10086
restore-keys: |
10187
depends-sources-
10288
103-
- name: Cache dependencies
89+
- name: Cache depends
10490
uses: actions/cache@v4
10591
with:
10692
path: |
93+
depends/built
10794
depends/${{ matrix.host }}
10895
key: ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
10996
restore-keys: |
11097
${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
11198
${{ runner.os }}-depends-${{ matrix.build_target }}
11299
113-
- name: Build dependencies
100+
- name: Build depends
114101
run: make -j$(nproc) -C depends HOST=${{ matrix.host }}
115102

116103
build:
@@ -123,20 +110,28 @@ jobs:
123110
include:
124111
- build_target: arm-linux
125112
host: arm-linux-gnueabihf
113+
depends_on: arm-linux
126114
- build_target: linux64
127115
host: x86_64-pc-linux-gnu
116+
depends_on: linux64
128117
- build_target: linux64_tsan
129118
host: x86_64-pc-linux-gnu
119+
depends_on: linux64
130120
- build_target: linux64_ubsan
131121
host: x86_64-pc-linux-gnu
122+
depends_on: linux64
132123
- build_target: linux64_fuzz
133124
host: x86_64-pc-linux-gnu
125+
depends_on: linux64
134126
- build_target: linux64_cxx20
135127
host: x86_64-pc-linux-gnu
128+
depends_on: linux64
136129
- build_target: linux64_sqlite
137130
host: x86_64-pc-linux-gnu
131+
depends_on: linux64
138132
- build_target: linux64_nowallet
139133
host: x86_64-pc-linux-gnu
134+
depends_on: linux64
140135
container:
141136
image: ghcr.io/${{ needs.build-image.outputs.repo-name }}/dashcore-ci-runner:${{ needs.build-image.outputs.image-tag }}
142137
options: --user root
@@ -146,16 +141,13 @@ jobs:
146141
with:
147142
ref: ${{ github.event.pull_request.head.sha }}
148143

149-
150-
- name: Restore Cache dependencies
144+
- name: Restore depends cache
151145
uses: actions/cache/restore@v4
152146
with:
153147
path: |
148+
depends/built
154149
depends/${{ matrix.host }}
155-
key: ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
156-
restore-keys: |
157-
${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
158-
${{ runner.os }}-depends-${{ matrix.build_target }}
150+
key: ${{ runner.os }}-depends-${{ matrix.depends_on }}-${{ hashFiles('depends/packages/*') }}
159151

160152
- name: Determine PR Base SHA
161153
id: vars
@@ -192,32 +184,3 @@ jobs:
192184
name: build-artifacts-${{ matrix.build_target }}
193185
path: |
194186
/output
195-
196-
197-
# Come back to this later and implement tests :)
198-
# test:
199-
# name: Test
200-
# needs: [build-image, build]
201-
# runs-on: ubuntu-22.04
202-
# container:
203-
# image: ghcr.io/${{ needs.build-image.outputs.repo-name }}/dashcore-ci-runner:${{ needs.build-image.outputs.image-tag }}
204-
# options: --user root
205-
# steps:
206-
# - name: Checkout code
207-
# uses: actions/checkout@v4
208-
# with:
209-
# ref: ${{ github.event.pull_request.head.sha }}
210-
#
211-
# - name: Download build artifacts
212-
# uses: actions/download-artifact@v4
213-
# with:
214-
# name: build-artifacts
215-
# path: src/
216-
#
217-
## - name: Setup environment
218-
## run: |
219-
## echo "BUILD_TARGET=${{ needs.build.matrix.build_target }}"
220-
## source ./ci/dash/matrix.sh
221-
#
222-
# - name: Run integration tests
223-
# run: ./ci/dash/test_integrationtests.sh --extended --exclude feature_pruning,feature_dbcrash

‎.github/workflows/guix-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
# if: ${{ contains(github.event.pull_request.labels.*.name, 'guix-build') }}
6969
strategy:
7070
matrix:
71-
build_target: [x86_64-linux-gnu, arm-linux-gnueabihf, aarch64-linux-gnu, riscv64-linux-gnu, x86_64-w64-mingw32, x86_64-apple-darwin, arm64-apple-darwin]
71+
build_target: [x86_64-linux-gnu, arm-linux-gnueabihf, aarch64-linux-gnu, riscv64-linux-gnu, powerpc64-linux-gnu, x86_64-w64-mingw32, x86_64-apple-darwin, arm64-apple-darwin]
7272

7373
timeout-minutes: 480
7474
steps:

0 commit comments

Comments
 (0)