Skip to content

Commit a38bb0c

Browse files
obycodeobycode
committed
Merge branch 'develop' into feat/add-tenure-extend-buffer
2 parents aacc03b + e250a95 commit a38bb0c

File tree

36 files changed

+1230
-622
lines changed

36 files changed

+1230
-622
lines changed

‎.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/ci.yml

Lines changed: 64 additions & 39 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,16 +122,14 @@ 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' ||
132+
needs.check-release.outputs.is_node_release == 'true' ||
116133
github.event_name == 'workflow_dispatch' ||
117134
github.event_name == 'pull_request' ||
118135
github.event_name == 'merge_group'
@@ -125,16 +142,15 @@ jobs:
125142
## Tests to run regularly
126143
##
127144
## Runs when:
128-
## - it is a release run
129-
## or:
130-
## - it is not a release run
131-
## and any of:
132-
## - this workflow is called manually
133-
## - PR is opened
134-
## - PR added to merge queue
135-
## - 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
136150
stacks-core-tests:
137151
if: |
152+
needs.check-release.outputs.is_node_release == 'true' ||
153+
needs.check-release.outputs.is_signer_release == 'true' ||
138154
github.event_name == 'workflow_dispatch' ||
139155
github.event_name == 'pull_request' ||
140156
github.event_name == 'merge_group'
@@ -148,16 +164,15 @@ jobs:
148164
## Checks to run on built binaries
149165
##
150166
## Runs when:
151-
## - it is a release run
152-
## or:
153-
## - it is not a release run
154-
## and any of:
155-
## - this workflow is called manually
156-
## - PR is opened
157-
## - PR added to merge queue
158-
## - 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
159172
stacks-core-build-tests:
160173
if: |
174+
needs.check-release.outputs.is_node_release == 'true' ||
175+
needs.check-release.outputs.is_signer_release == 'true' ||
161176
github.event_name == 'workflow_dispatch' ||
162177
github.event_name == 'pull_request' ||
163178
github.event_name == 'merge_group'
@@ -167,8 +182,17 @@ jobs:
167182
- check-release
168183
uses: ./.github/workflows/core-build-tests.yml
169184

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
170193
bitcoin-tests:
171194
if: |
195+
needs.check-release.outputs.is_node_release == 'true' ||
172196
github.event_name == 'workflow_dispatch' ||
173197
github.event_name == 'pull_request' ||
174198
github.event_name == 'merge_group'
@@ -181,6 +205,7 @@ jobs:
181205

182206
p2p-tests:
183207
if: |
208+
needs.check-release.outputs.is_node_release == 'true' ||
184209
github.event_name == 'workflow_dispatch' ||
185210
github.event_name == 'pull_request' ||
186211
github.event_name == 'merge_group'
@@ -194,9 +219,9 @@ jobs:
194219
## Test to run on a tagged release
195220
##
196221
## Runs when:
197-
## - it is a release run
222+
## - it is a node release run
198223
atlas-tests:
199-
if: needs.check-release.outputs.is_release == 'true'
224+
if: needs.check-release.outputs.is_node_release == 'true'
200225
name: Atlas Tests
201226
needs:
202227
- rustfmt
@@ -205,7 +230,7 @@ jobs:
205230
uses: ./.github/workflows/atlas-tests.yml
206231

207232
epoch-tests:
208-
if: needs.check-release.outputs.is_release == 'true'
233+
if: needs.check-release.outputs.is_node_release == 'true'
209234
name: Epoch Tests
210235
needs:
211236
- rustfmt
@@ -214,7 +239,7 @@ jobs:
214239
uses: ./.github/workflows/epoch-tests.yml
215240

216241
slow-tests:
217-
if: needs.check-release.outputs.is_release == 'true'
242+
if: needs.check-release.outputs.is_node_release == 'true'
218243
name: Slow Tests
219244
needs:
220245
- rustfmt

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

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

0 commit comments

Comments
 (0)