Skip to content

Commit 9775102

Browse files
wileyjwileyj
authored
Merge pull request #4668 from stacks-network/release/2.5.0.0.0
Release PR: 2.5.0.0.0
2 parents edef6f1 + abe0a0a commit 9775102

File tree

430 files changed

+84807
-16122
lines changed

Some content is hidden

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

430 files changed

+84807
-16122
lines changed

‎.cargo/config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
stacks-node = "run --package stacks-node --"
33
fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
44

5+
# Uncomment to improve performance slightly, at the cost of portability
6+
# * Note that native binaries may not run on CPUs that are different from the build machine
7+
# [build]
8+
# rustflags = ["-Ctarget-cpu=native"]
9+
510
# Needed by perf to generate flamegraphs.
611
#[target.x86_64-unknown-linux-gnu]
712
#linker = "/usr/bin/clang"
813
#rustflags = ["-Clink-arg=-fuse-ld=lld", "-Clink-arg=-Wl,--no-rosegment"]
14+

‎.github/actions/bitcoin-int-tests/Dockerfile.atlas-test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
FROM rust:bullseye
1+
FROM rust:bookworm
22

33
WORKDIR /src
44

55
COPY . .
66

7+
RUN apt-get -y install libllvm16 libclang1-16
8+
79
RUN cargo test --no-run --workspace
810

911
RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-25.0/bitcoin-25.0-x86_64-linux-gnu.tar.gz

‎.github/actions/bitcoin-int-tests/Dockerfile.generic.bitcoin-tests

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:bullseye
1+
FROM rust:bookworm
22

33
WORKDIR /src/
44

@@ -12,6 +12,8 @@ RUN rustup component add llvm-tools-preview && \
1212
ENV RUSTFLAGS="-Cinstrument-coverage" \
1313
LLVM_PROFILE_FILE="stacks-blockchain-%p-%m.profraw"
1414

15+
RUN apt-get -y install libllvm16 libclang1-16
16+
1517
RUN cargo test --no-run && \
1618
cargo build
1719

‎.github/actions/bitcoin-int-tests/Dockerfile.large-genesis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:bullseye AS test
1+
FROM rust:bookworm AS test
22

33
WORKDIR /src
44

‎.github/actions/bitcoin-int-tests/Dockerfile.net-tests

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:bullseye
1+
FROM rust:bookworm
22

33
WORKDIR /src
44

@@ -11,7 +11,7 @@ RUN ln -s /bitcoin-25.0/bin/bitcoind /bin/
1111
RUN ln -s /bitcoin-25.0/bin/bitcoin-cli /bin/
1212

1313
RUN apt-get update
14-
RUN apt-get install -y jq screen net-tools ncat sqlite3 xxd openssl curl
14+
RUN apt-get install -y jq screen net-tools ncat sqlite3 xxd openssl curl libllvm16 libclang1-16
1515

1616
RUN cargo build --workspace
1717

‎.github/actions/bitcoin-int-tests/Dockerfile.rustfmt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:bullseye
1+
FROM rust:bookworm
22

33
WORKDIR /src
44

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,21 @@ ARG TARGETPLATFORM
77
ARG BUILDPLATFORM
88
ARG TARGETARCH
99
ARG TARGETVARIANT
10-
ARG REPO=stacks-network/stacks-core
10+
ARG REPO
1111

12-
RUN case ${TARGETARCH} in \
13-
"amd64") BIN_ARCH=linux-musl-x64 ;; \
14-
"arm64") BIN_ARCH=linux-musl-arm64 ;; \
15-
"arm") BIN_ARCH=linux-musl-armv7 ;; \
16-
"*") exit 1 ;; \
12+
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 ;; \
17+
*) exit 1 ;; \
1718
esac \
18-
&& echo "wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip" \
19-
&& wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip \
19+
&& echo "TARGETPLATFORM: $TARGETPLATFORM" \
20+
&& echo "BIN_ARCH: $BIN_ARCH" \
21+
&& echo "wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip" \
22+
&& wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip \
2023
&& unzip ${BIN_ARCH}.zip -d /out
2124

2225
FROM --platform=${TARGETPLATFORM} alpine
23-
COPY --from=builder /out/stacks-node /bin/
26+
COPY --from=builder /out/stacks-node /out/stacks-signer /bin/
2427
CMD ["stacks-node", "mainnet"]

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,21 @@ ARG TARGETPLATFORM
77
ARG BUILDPLATFORM
88
ARG TARGETARCH
99
ARG TARGETVARIANT
10-
ARG REPO=stacks-network/stacks-core
10+
ARG REPO
1111

12-
RUN case ${TARGETARCH} in \
13-
"amd64") BIN_ARCH=linux-musl-x64 ;; \
14-
"arm64") BIN_ARCH=linux-musl-arm64 ;; \
15-
"arm") BIN_ARCH=linux-musl-armv7 ;; \
16-
"*") exit 1 ;; \
12+
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 ;; \
17+
*) exit 1 ;; \
1718
esac \
18-
&& echo "wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip" \
19-
&& wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip \
19+
&& echo "TARGETPLATFORM: $TARGETPLATFORM" \
20+
&& echo "BIN_ARCH: $BIN_ARCH" \
21+
&& echo "wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip" \
22+
&& wget -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip \
2023
&& unzip ${BIN_ARCH}.zip -d /out
2124

22-
FROM --platform=${TARGETPLATFORM} debian:bullseye
23-
COPY --from=builder /out/stacks-node /bin/
25+
FROM --platform=${TARGETPLATFORM} debian:bookworm
26+
COPY --from=builder /out/stacks-node /out/stacks-signer /bin/
2427
CMD ["stacks-node", "mainnet"]

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
1-
FROM rust:bullseye as build
1+
FROM rust:bookworm as build
22

33
ARG STACKS_NODE_VERSION="No Version Info"
44
ARG GIT_BRANCH='No Branch Info'
55
ARG GIT_COMMIT='No Commit Info'
66
ARG BUILD_DIR=/build
77
ARG TARGET=x86_64-unknown-linux-gnu
8+
# Allow us to override the default `--target-cpu` for the given target triplet
9+
ARG TARGET_CPU
10+
ENV RUSTFLAGS="${TARGET_CPU:+${RUSTFLAGS} -Ctarget-cpu=${TARGET_CPU}}"
811
WORKDIR /src
912

1013
COPY . .
1114

1215
RUN apt-get update && apt-get install -y git libclang-dev
1316

1417
# Run all the build steps in ramdisk in an attempt to speed things up
15-
RUN target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
18+
RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
1619
&& cd ${BUILD_DIR} \
1720
&& rustup target add ${TARGET} \
1821
&& rustup component add rustfmt \
1922
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
2023
&& mkdir -p /out \
2124
&& cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
2225

23-
FROM --platform=${TARGETPLATFORM} debian:bullseye
24-
COPY --from=build /out/stacks-node /bin/
26+
FROM --platform=${TARGETPLATFORM} debian:bookworm
27+
COPY --from=build /out/stacks-node /out/stacks-signer /bin/
2528
CMD ["stacks-node", "mainnet"]

‎.github/actions/docsgen/Dockerfile.docsgen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:bullseye as build
1+
FROM rust:bookworm as build
22

33
WORKDIR /src
44

0 commit comments

Comments
 (0)