Skip to content

Commit c78b57e

Browse files
csguicsgui
authored
Merge pull request #5852 from stacks-network/develop-into-clarity-wasm-develop
Merge develop into feat/clarity-wasm-develop
2 parents 90ff09e + bc738d1 commit c78b57e

File tree

395 files changed

+21189
-18524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

395 files changed

+21189
-18524
lines changed

‎.cargo/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[alias]
22
stacks-node = "run --package stacks-node --"
33
fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
4+
clippy-stacks = "clippy -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
45

56
# Uncomment to improve performance slightly, at the cost of portability
67
# * Note that native binaries may not run on CPUs that are different from the build machine

‎.github/actions/dockerfiles/Dockerfile.alpine-binary

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ ARG TARGETVARIANT
1010
ARG REPO
1111

1212
RUN case ${TARGETPLATFORM} in \
13-
linux/amd64/v2) BIN_ARCH=linux-glibc-x64-v2 ;; \
14-
linux/amd64*) BIN_ARCH=linux-glibc-x64 ;; \
15-
linux/arm64*) BIN_ARCH=linux-glibc-arm64 ;; \
16-
linux/arm/v7) BIN_ARCH=linux-glibc-armv7 ;; \
13+
linux/amd64*) BIN_ARCH=linux-musl-x64 ;; \
14+
linux/arm64*) BIN_ARCH=linux-musl-arm64 ;; \
15+
linux/arm/v7) BIN_ARCH=linux-musl-armv7 ;; \
1716
*) exit 1 ;; \
1817
esac \
1918
&& echo "TARGETPLATFORM: $TARGETPLATFORM" \

‎.github/actions/dockerfiles/Dockerfile.debian-binary

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ARG TARGETVARIANT
1010
ARG REPO
1111

1212
RUN case ${TARGETPLATFORM} in \
13-
linux/amd64/v2) BIN_ARCH=linux-glibc-x64-v2 ;; \
1413
linux/amd64*) BIN_ARCH=linux-glibc-x64 ;; \
1514
linux/arm64*) BIN_ARCH=linux-glibc-arm64 ;; \
1615
linux/arm/v7) BIN_ARCH=linux-glibc-armv7 ;; \

‎.github/workflows/bitcoin-tests.yml

Lines changed: 94 additions & 136 deletions
Large diffs are not rendered by default.

‎.github/workflows/ci.yml

Lines changed: 79 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -52,47 +52,66 @@ jobs:
5252

5353
######################################################################################
5454
## Check if the branch that this workflow is being run against is a release branch
55+
##
56+
## Outputs:
57+
## - node_tag: Tag of the stacks-node if the branch is a release one (example: release/3.4.0.0.1), null otherwise
58+
## - node_docker_tag: Version of the stacks-node if the branch is a release one (example: 3.4.0.0.1), null otherwise
59+
## - signer_tag: Tag of the stacks-signer if the branch is a release one (example: release/3.4.0.0.1.0), null otherwise
60+
## - signer_docker_tag: Version of the stacks-signer if the branch is a release one (example: 3.4.0.0.1.0), null otherwise
61+
## - is_node_release: True if the branch represents a 'stacks-node' release, false otherwise.
62+
## If this is true, 'is_signer_release' will also be true, since a 'stacks-signer' binary
63+
## is always released alongside 'stacks-node'.
64+
## - is_signer_release: True if the branch represents a 'stacks-signer' release, false otherwise.
5565
check-release:
5666
name: Check Release
5767
needs:
5868
- rustfmt
5969
runs-on: ubuntu-latest
6070
outputs:
61-
tag: ${{ steps.check_release.outputs.tag }}
62-
docker_tag: ${{ steps.check_release.outputs.docker_tag }}
63-
is_release: ${{ steps.check_release.outputs.is_release }}
71+
node_tag: ${{ steps.check_release.outputs.node_tag }}
72+
node_docker_tag: ${{ steps.check_release.outputs.node_docker_tag }}
73+
signer_tag: ${{ steps.check_release.outputs.signer_tag }}
74+
signer_docker_tag: ${{ steps.check_release.outputs.signer_docker_tag }}
75+
is_node_release: ${{ steps.check_release.outputs.is_node_release }}
76+
is_signer_release: ${{ steps.check_release.outputs.is_signer_release }}
6477
steps:
6578
- name: Check Release
6679
id: check_release
67-
uses: stacks-network/actions/stacks-core/check-release@main
80+
uses: stacks-network/actions/stacks-core/release/check-release@main
6881
with:
6982
tag: ${{ github.ref_name }}
7083

7184
######################################################################################
7285
## Create a tagged github release
7386
##
7487
## Runs when:
75-
## - it is a release run
88+
## - it is either a node release or a signer release
7689
create-release:
7790
if: |
78-
needs.check-release.outputs.is_release == 'true'
79-
name: Create Release
91+
needs.check-release.outputs.is_node_release == 'true' ||
92+
needs.check-release.outputs.is_signer_release == 'true'
93+
name: Create Release(s)
8094
needs:
8195
- rustfmt
8296
- check-release
8397
uses: ./.github/workflows/github-release.yml
8498
with:
85-
tag: ${{ needs.check-release.outputs.tag }}
86-
docker_tag: ${{ needs.check-release.outputs.docker_tag }}
99+
node_tag: ${{ needs.check-release.outputs.node_tag }}
100+
node_docker_tag: ${{ needs.check-release.outputs.node_docker_tag }}
101+
signer_tag: ${{ needs.check-release.outputs.signer_tag }}
102+
signer_docker_tag: ${{ needs.check-release.outputs.signer_docker_tag }}
103+
is_node_release: ${{ needs.check-release.outputs.is_node_release }}
104+
is_signer_release: ${{ needs.check-release.outputs.is_signer_release }}
87105
secrets: inherit
88106

89107
## Build and push Debian image built from source
90108
##
91109
## Runs when:
92-
## - it is not a release run
110+
## - it is not a node or signer-only release run
93111
docker-image:
94112
if: |
95-
needs.check-release.outputs.is_release != 'true'
113+
needs.check-release.outputs.is_node_release != 'true' ||
114+
needs.check-release.outputs.is_signer_release != 'true'
96115
name: Docker Image (Source)
97116
uses: ./.github/workflows/image-build-source.yml
98117
needs:
@@ -103,28 +122,17 @@ jobs:
103122
## Create a reusable cache for tests
104123
##
105124
## Runs when:
106-
## - it is a release run
107-
## or:
108-
## - it is not a release run
109-
## and any of:
110-
## - this workflow is called manually
111-
## - PR is opened
112-
## - commit to either (development, master) branch
125+
## - it is a node release run
126+
## or any of:
127+
## - this workflow is called manually
128+
## - PR is opened
129+
## - PR added to merge queue
113130
create-cache:
114131
if: |
115-
needs.check-release.outputs.is_release == 'true' || (
116-
github.event_name == 'workflow_dispatch' ||
117-
github.event_name == 'pull_request' ||
118-
github.event_name == 'merge_group' ||
119-
(
120-
contains('
121-
refs/heads/master
122-
refs/heads/develop
123-
refs/heads/next
124-
', github.event.pull_request.head.ref) &&
125-
github.event_name == 'push'
126-
)
127-
)
132+
needs.check-release.outputs.is_node_release == 'true' ||
133+
github.event_name == 'workflow_dispatch' ||
134+
github.event_name == 'pull_request' ||
135+
github.event_name == 'merge_group'
128136
name: Create Test Cache
129137
needs:
130138
- rustfmt
@@ -134,29 +142,18 @@ jobs:
134142
## Tests to run regularly
135143
##
136144
## Runs when:
137-
## - it is a release run
138-
## or:
139-
## - it is not a release run
140-
## and any of:
141-
## - this workflow is called manually
142-
## - PR is opened
143-
## - PR added to merge queue
144-
## - commit to either (development, next, master) branch
145+
## - it is a node or signer-only release run
146+
## or any of:
147+
## - this workflow is called manually
148+
## - PR is opened
149+
## - PR added to merge queue
145150
stacks-core-tests:
146151
if: |
147-
needs.check-release.outputs.is_release == 'true' || (
148-
github.event_name == 'workflow_dispatch' ||
149-
github.event_name == 'pull_request' ||
150-
github.event_name == 'merge_group' ||
151-
(
152-
contains('
153-
refs/heads/master
154-
refs/heads/develop
155-
refs/heads/next
156-
', github.event.pull_request.head.ref) &&
157-
github.event_name == 'push'
158-
)
159-
)
152+
needs.check-release.outputs.is_node_release == 'true' ||
153+
needs.check-release.outputs.is_signer_release == 'true' ||
154+
github.event_name == 'workflow_dispatch' ||
155+
github.event_name == 'pull_request' ||
156+
github.event_name == 'merge_group'
160157
name: Stacks Core Tests
161158
needs:
162159
- rustfmt
@@ -167,73 +164,51 @@ jobs:
167164
## Checks to run on built binaries
168165
##
169166
## Runs when:
170-
## - it is a release run
171-
## or:
172-
## - it is not a release run
173-
## and any of:
174-
## - this workflow is called manually
175-
## - PR is opened
176-
## - PR added to merge queue
177-
## - commit to either (development, next, master) branch
167+
## - it is a node or signer-only release run
168+
## or any of:
169+
## - this workflow is called manually
170+
## - PR is opened
171+
## - PR added to merge queue
178172
stacks-core-build-tests:
179173
if: |
180-
needs.check-release.outputs.is_release == 'true' || (
181-
github.event_name == 'workflow_dispatch' ||
182-
github.event_name == 'pull_request' ||
183-
github.event_name == 'merge_group' ||
184-
(
185-
contains('
186-
refs/heads/master
187-
refs/heads/develop
188-
refs/heads/next
189-
', github.event.pull_request.head.ref) &&
190-
github.event_name == 'push'
191-
)
192-
)
174+
needs.check-release.outputs.is_node_release == 'true' ||
175+
needs.check-release.outputs.is_signer_release == 'true' ||
176+
github.event_name == 'workflow_dispatch' ||
177+
github.event_name == 'pull_request' ||
178+
github.event_name == 'merge_group'
193179
name: Stacks Core Build Tests
194180
needs:
195181
- rustfmt
196182
- check-release
197183
uses: ./.github/workflows/core-build-tests.yml
198184

185+
## Checks to run on built binaries
186+
##
187+
## Runs when:
188+
## - it is a node release run
189+
## or any of:
190+
## - this workflow is called manually
191+
## - PR is opened
192+
## - PR added to merge queue
199193
bitcoin-tests:
200194
if: |
201-
needs.check-release.outputs.is_release == 'true' || (
202-
github.event_name == 'workflow_dispatch' ||
203-
github.event_name == 'pull_request' ||
204-
github.event_name == 'merge_group' ||
205-
(
206-
contains('
207-
refs/heads/master
208-
refs/heads/develop
209-
refs/heads/next
210-
', github.event.pull_request.head.ref) &&
211-
github.event_name == 'push'
212-
)
213-
)
195+
needs.check-release.outputs.is_node_release == 'true' ||
196+
github.event_name == 'workflow_dispatch' ||
197+
github.event_name == 'pull_request' ||
198+
github.event_name == 'merge_group'
214199
name: Bitcoin Tests
215200
needs:
216201
- rustfmt
217202
- create-cache
218203
- check-release
219204
uses: ./.github/workflows/bitcoin-tests.yml
220205

221-
222206
p2p-tests:
223207
if: |
224-
needs.check-release.outputs.is_release == 'true' || (
225-
github.event_name == 'workflow_dispatch' ||
226-
github.event_name == 'pull_request' ||
227-
github.event_name == 'merge_group' ||
228-
(
229-
contains('
230-
refs/heads/master
231-
refs/heads/develop
232-
refs/heads/next
233-
', github.event.pull_request.head.ref) &&
234-
github.event_name == 'push'
235-
)
236-
)
208+
needs.check-release.outputs.is_node_release == 'true' ||
209+
github.event_name == 'workflow_dispatch' ||
210+
github.event_name == 'pull_request' ||
211+
github.event_name == 'merge_group'
237212
name: P2P Tests
238213
needs:
239214
- rustfmt
@@ -244,9 +219,9 @@ jobs:
244219
## Test to run on a tagged release
245220
##
246221
## Runs when:
247-
## - it is a release run
222+
## - it is a node release run
248223
atlas-tests:
249-
if: needs.check-release.outputs.is_release == 'true'
224+
if: needs.check-release.outputs.is_node_release == 'true'
250225
name: Atlas Tests
251226
needs:
252227
- rustfmt
@@ -255,7 +230,7 @@ jobs:
255230
uses: ./.github/workflows/atlas-tests.yml
256231

257232
epoch-tests:
258-
if: needs.check-release.outputs.is_release == 'true'
233+
if: needs.check-release.outputs.is_node_release == 'true'
259234
name: Epoch Tests
260235
needs:
261236
- rustfmt
@@ -264,7 +239,7 @@ jobs:
264239
uses: ./.github/workflows/epoch-tests.yml
265240

266241
slow-tests:
267-
if: needs.check-release.outputs.is_release == 'true'
242+
if: needs.check-release.outputs.is_node_release == 'true'
268243
name: Slow Tests
269244
needs:
270245
- rustfmt

‎.github/workflows/clippy.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,4 @@ jobs:
3434
components: clippy
3535
- name: Clippy
3636
id: clippy
37-
uses: actions-rs/clippy-check@v1
38-
with:
39-
token: ${{ secrets.GITHUB_TOKEN }}
40-
args: -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings
37+
run: cargo clippy-stacks

‎.github/workflows/create-source-binary.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)