Skip to content

Commit ffad4bd

Browse files
Merge branch 'develop' into feat/non-blocking-event-delivery
2 parents 4e7099d + 41bd9d0 commit ffad4bd

File tree

144 files changed

+12067
-6164
lines changed

Some content is hidden

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

144 files changed

+12067
-6164
lines changed

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

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

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

Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM alpine AS builder
2+
3+
ARG TARGETPLATFORM
4+
ENV ARCHIVE_ROOT="/release"
5+
6+
# upload the release artifacts downloaded to /tmp/release to /release in the build stage
7+
COPY ./release/ $ARCHIVE_ROOT
8+
9+
RUN case ${TARGETPLATFORM} in \
10+
linux/amd64*) ARCHIVE=${ARCHIVE_ROOT}/linux-musl-x64.zip ;; \
11+
linux/arm64*) ARCHIVE=${ARCHIVE_ROOT}/linux-musl-arm64.zip ;; \
12+
*) exit 1 ;; \
13+
esac \
14+
&& unzip "$ARCHIVE" "stacks-node" -d /out
15+
16+
FROM alpine
17+
COPY --from=builder /out/* /bin/
18+
CMD ["/bin/stacks-node", "mainnet"]
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM alpine AS builder
2+
3+
LABEL org.opencontainers.image.description="Stacks Signer CLI"
4+
5+
ARG TARGETPLATFORM
6+
ENV ARCHIVE_ROOT="/release"
7+
8+
# upload the release artifacts downloaded to /tmp/release to /release in the build stage
9+
COPY ./release/ $ARCHIVE_ROOT
10+
11+
RUN case ${TARGETPLATFORM} in \
12+
linux/amd64*) ARCHIVE=${ARCHIVE_ROOT}/linux-musl-x64.zip ;; \
13+
linux/arm64*) ARCHIVE=${ARCHIVE_ROOT}/linux-musl-arm64.zip ;; \
14+
*) exit 1 ;; \
15+
esac \
16+
&& unzip "$ARCHIVE" "stacks-signer" -d /out
17+
18+
FROM alpine
19+
COPY --from=builder /out/* /bin/
20+
CMD ["/bin/stacks-signer", "run", "--config", "/signer-config.toml"]
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Dockerfile used to build an image including all binaries
2+
FROM alpine AS builder
3+
4+
ARG TARGETPLATFORM
5+
ENV ARCHIVE_ROOT="/release"
6+
7+
# upload the release artifacts downloaded to /tmp/release to /release in the build stage
8+
COPY ./release/ $ARCHIVE_ROOT
9+
10+
RUN case ${TARGETPLATFORM} in \
11+
linux/amd64*) ARCHIVE=${ARCHIVE_ROOT}/linux-glibc-x64.zip ;; \
12+
linux/arm64*) ARCHIVE=${ARCHIVE_ROOT}/linux-glibc-arm64.zip ;; \
13+
*) exit 1 ;; \
14+
esac \
15+
&& unzip "$ARCHIVE" -d /out
16+
17+
FROM debian:stable-slim
18+
COPY --from=builder /out/* /bin/
19+
CMD ["/bin/stacks-node", "mainnet"]
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM alpine AS builder
2+
3+
ARG TARGETPLATFORM
4+
ENV ARCHIVE_ROOT="/release"
5+
6+
# upload the release artifacts downloaded to /tmp/release to /release in the build stage
7+
COPY ./release/ $ARCHIVE_ROOT
8+
9+
RUN case ${TARGETPLATFORM} in \
10+
linux/amd64*) ARCHIVE=${ARCHIVE_ROOT}/linux-glibc-x64.zip ;; \
11+
linux/arm64*) ARCHIVE=${ARCHIVE_ROOT}/linux-glibc-arm64.zip ;; \
12+
*) exit 1 ;; \
13+
esac \
14+
&& unzip "$ARCHIVE" "stacks-node" -d /out
15+
16+
FROM debian:stable-slim
17+
COPY --from=builder /out/* /bin/
18+
CMD ["/bin/stacks-node", "mainnet"]
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM alpine AS builder
2+
LABEL org.opencontainers.image.description="Stacks Signer CLI"
3+
4+
ARG TARGETPLATFORM
5+
ENV ARCHIVE_ROOT="/release"
6+
7+
# upload the release artifacts downloaded to /tmp/release to /release in the build stage
8+
COPY ./release/ $ARCHIVE_ROOT
9+
10+
RUN case ${TARGETPLATFORM} in \
11+
linux/amd64*) ARCHIVE=${ARCHIVE_ROOT}/linux-glibc-x64.zip ;; \
12+
linux/arm64*) ARCHIVE=${ARCHIVE_ROOT}/linux-glibc-arm64.zip ;; \
13+
*) exit 1 ;; \
14+
esac \
15+
&& unzip "$ARCHIVE" "stacks-signer" -d /out
16+
17+
FROM debian:stable-slim
18+
COPY --from=builder /out/* /bin/
19+
CMD ["/bin/stacks-signer", "run", "--config", "/signer-config.toml"]

.github/workflows/atlas-tests.yml

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

.github/workflows/bitcoin-tests.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ jobs:
3232
with:
3333
btc-version: "25.0"
3434

35-
- name: Build Test Archive
36-
run: |
37-
set -euo pipefail
38-
cargo nextest archive --archive-file ~/test_archive.tar.zst --bin stacks-node
39-
4035
- name: List ignored tests
4136
id: list
4237
run: |
@@ -105,6 +100,7 @@ jobs:
105100
tests::nakamoto_integrations::large_mempool_next_constant_fee
106101
tests::nakamoto_integrations::large_mempool_next_random_fee
107102
tests::nakamoto_integrations::larger_mempool
103+
tests::nakamoto_integrations::check_block_info_rewards
108104
tests::signer::v0::larger_mempool
109105
EOF
110106

.github/workflows/ci.yml

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- next
1312
paths-ignore:
1413
- "**.md"
1514
- "**.yml"
@@ -85,23 +84,25 @@ jobs:
8584
##
8685
## Runs when:
8786
## - it is either a node release or a signer release
87+
88+
## create-release will call the reusable workflows to:
89+
# - build the binary artifacts
90+
# - create the release docker images
91+
# - create the github release.
8892
create-release:
8993
if: |
9094
needs.check-release.outputs.is_node_release == 'true' ||
9195
needs.check-release.outputs.is_signer_release == 'true'
92-
name: Create Release(s)
96+
name: Create Release
9397
needs:
9498
- rustfmt
9599
- check-release
96100
secrets: inherit
97-
uses: ./.github/workflows/github-release.yml
101+
uses: ./.github/workflows/release-github.yml
98102
with:
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 }}
103+
node_tag: ${{ needs.check-release.outputs.node_docker_tag }} # 5 place version format like x.x.x.x.x
104+
signer_tag: ${{ needs.check-release.outputs.signer_docker_tag }} # 6 place version format like x.x.x.x.x.x
105+
is_node_release: ${{ needs.check-release.outputs.is_node_release }} # used in matrix conitional in release-github.yml
105106

106107
## Create a reusable cache for tests
107108
##
@@ -225,15 +226,6 @@ jobs:
225226
##
226227
## Runs when:
227228
## - it is a node release run
228-
atlas-tests:
229-
if: needs.check-release.outputs.is_node_release == 'true'
230-
name: Atlas Tests
231-
needs:
232-
- rustfmt
233-
- create-cache
234-
- check-release
235-
uses: ./.github/workflows/atlas-tests.yml
236-
237229
epoch-tests:
238230
if: needs.check-release.outputs.is_node_release == 'true'
239231
name: Epoch Tests
@@ -242,12 +234,3 @@ jobs:
242234
- create-cache
243235
- check-release
244236
uses: ./.github/workflows/epoch-tests.yml
245-
246-
slow-tests:
247-
if: needs.check-release.outputs.is_node_release == 'true'
248-
name: Slow Tests
249-
needs:
250-
- rustfmt
251-
- create-cache
252-
- check-release
253-
uses: ./.github/workflows/slow-tests.yml

0 commit comments

Comments
 (0)