Skip to content

Commit c659fca

Browse files
wileyjwileyj
authored
Merge pull request #4312 from stacks-network/ci/fix-release-builds
Target specific binaries for release builds
2 parents 1d8920e + 893a7c6 commit c659fca

9 files changed

+16
-12
lines changed

‎build-scripts/Dockerfile.linux-glibc-arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
1818
&& CC=aarch64-linux-gnu-gcc \
1919
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
2020
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
21-
cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
21+
cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} --bin stacks-node --bin stacks-inspect --bin clarity-cli --bin blockstack-cli \
2222
&& mkdir -p /out \
2323
&& cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
2424

‎build-scripts/Dockerfile.linux-glibc-armv7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
1818
&& CC=arm-linux-gnueabihf-gcc \
1919
CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
2020
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
21-
cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
21+
cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} --bin stacks-node --bin stacks-inspect --bin clarity-cli --bin blockstack-cli \
2222
&& mkdir -p /out \
2323
&& cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
2424

2525
FROM scratch AS export-stage
26-
COPY --from=build /out/stacks-inspect /out/blockstack-cli /out/clarity-cli /out/stacks-node /
26+
COPY --from=build /out/stacks-inspect /out/blockstack-cli /out/clarity-cli /out/stacks-node /

‎build-scripts/Dockerfile.linux-glibc-x64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y git
1515
RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
1616
&& cd ${BUILD_DIR} \
1717
&& rustup target add ${TARGET} \
18-
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
18+
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} --bin stacks-node --bin stacks-inspect --bin clarity-cli --bin blockstack-cli \
1919
&& mkdir -p /out \
2020
&& cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
2121

‎build-scripts/Dockerfile.linux-musl-arm64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ COPY . .
1313
RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
1414
&& cd ${BUILD_DIR} \
1515
&& rustup target add ${TARGET} \
16-
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
16+
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} --bin stacks-node --bin stacks-inspect --bin clarity-cli --bin blockstack-cli \
1717
&& mkdir -p /out \
1818
&& cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
1919

2020
FROM scratch AS export-stage
2121
COPY --from=build /out/stacks-inspect /out/blockstack-cli /out/clarity-cli /out/stacks-node /
22+

‎build-scripts/Dockerfile.linux-musl-armv7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ COPY . .
1313
RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
1414
&& cd ${BUILD_DIR} \
1515
&& rustup target add ${TARGET} \
16-
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
16+
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} --bin stacks-node --bin stacks-inspect --bin clarity-cli --bin blockstack-cli \
1717
&& mkdir -p /out \
1818
&& cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
1919

2020
FROM scratch AS export-stage
21-
COPY --from=build /out/stacks-inspect /out/blockstack-cli /out/clarity-cli /out/stacks-node /
21+
COPY --from=build /out/stacks-inspect /out/blockstack-cli /out/clarity-cli /out/stacks-node /

‎build-scripts/Dockerfile.linux-musl-x64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ RUN apk update && apk add git musl-dev
1515
RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
1616
&& cd ${BUILD_DIR} \
1717
&& rustup target add ${TARGET} \
18-
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
18+
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} --bin stacks-node --bin stacks-inspect --bin clarity-cli --bin blockstack-cli \
1919
&& mkdir -p /out \
2020
&& cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
2121

2222
FROM scratch AS export-stage
2323
COPY --from=build /out/stacks-inspect /out/blockstack-cli /out/clarity-cli /out/stacks-node /
24+

‎build-scripts/Dockerfile.macos-arm64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
2121
&& cd ${BUILD_DIR} \
2222
&& rustup target add ${TARGET} \
2323
&& . /opt/osxcross/env-macos-aarch64 \
24-
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
24+
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} --bin stacks-node --bin stacks-inspect --bin clarity-cli --bin blockstack-cli \
2525
&& mkdir -p /out \
2626
&& cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
2727

2828
FROM scratch AS export-stage
2929
COPY --from=build /out/stacks-inspect /out/blockstack-cli /out/clarity-cli /out/stacks-node /
30+

‎build-scripts/Dockerfile.macos-x64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
2121
&& cd ${BUILD_DIR} \
2222
&& rustup target add ${TARGET} \
2323
&& . /opt/osxcross/env-macos-x86_64 \
24-
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
24+
&& cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} --bin stacks-node --bin stacks-inspect --bin clarity-cli --bin blockstack-cli \
2525
&& mkdir -p /out \
2626
&& cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
2727

2828
FROM scratch AS export-stage
2929
COPY --from=build /out/stacks-inspect /out/blockstack-cli /out/clarity-cli /out/stacks-node /
30+

‎build-scripts/Dockerfile.windows-x64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
1717
&& rustup target add ${TARGET} \
1818
&& CC_x86_64_pc_windows_gnu=x86_64-w64-mingw32-gcc \
1919
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc \
20-
cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
20+
cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} --bin stacks-node --bin stacks-inspect --bin clarity-cli --bin blockstack-cli \
2121
&& mkdir -p /out \
2222
&& cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
2323

2424
FROM scratch AS export-stage
25-
COPY --from=build /out/stacks-inspect.exe /out/blockstack-cli.exe /out/clarity-cli.exe /out/stacks-node.exe /
25+
COPY --from=build /out/stacks-inspect.exe /out/blockstack-cli.exe /out/clarity-cli.exe /out/stacks-node.exe /

0 commit comments

Comments
 (0)