Skip to content

Commit

Permalink
Merge branch 'the-right-joyce-update-guidelines' of https://github.co…
Browse files Browse the repository at this point in the history
…m/paritytech/polkadot-sdk into the-right-joyce-update-guidelines
  • Loading branch information
the-right-joyce committed Aug 28, 2023
2 parents 6efcaa7 + 579a6e4 commit e40235d
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 6 deletions.
8 changes: 6 additions & 2 deletions .gitlab/pipeline/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ build-linux-stable:
# Ensure we run the UI tests.
RUN_UI_TESTS: 1
script:
- time cargo build --locked --profile testnet --features pyroscope,fast-runtime --bin polkadot
- time cargo build --locked --profile testnet --features pyroscope,fast-runtime --bin polkadot --bin polkadot-prepare-worker --bin polkadot-execute-worker
# pack artifacts
- mkdir -p ./artifacts
- VERSION="${CI_COMMIT_REF_NAME}" # will be tag or branch name
- mv ./target/testnet/polkadot ./artifacts/.
- mv ./target/testnet/polkadot-prepare-worker ./artifacts/.
- mv ./target/testnet/polkadot-execute-worker ./artifacts/.
- pushd artifacts
- sha256sum polkadot | tee polkadot.sha256
- shasum -c polkadot.sha256
Expand Down Expand Up @@ -64,10 +66,12 @@ build-malus:
- .run-immediately
- .collect-artifacts
script:
- time cargo build --locked --profile testnet --verbose -p polkadot-test-malus
- time cargo build --locked --profile testnet --verbose -p polkadot-test-malus --bin malus --bin polkadot-prepare-worker --bin polkadot-execute-worker
# pack artifacts
- mkdir -p ./artifacts
- mv ./target/testnet/malus ./artifacts/.
- mv ./target/testnet/polkadot-execute-worker ./artifacts/.
- mv ./target/testnet/polkadot-prepare-worker ./artifacts/.
- echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
- echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
- echo "polkadot-test-malus = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
Expand Down
2 changes: 1 addition & 1 deletion docker/malus_injected.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN apt-get update && \


# add adder-collator binary to docker image
COPY ./artifacts/malus /usr/local/bin
COPY ./artifacts/malus ./artifacts/polkadot-execute-worker ./artifacts/polkadot-prepare-worker /usr/local/bin

USER nonroot

Expand Down
6 changes: 4 additions & 2 deletions docker/polkadot_injected_debug.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ RUN apt-get update && \
chown -R polkadot:polkadot /data && \
ln -s /data /polkadot/.local/share/polkadot

# add polkadot binary to docker image
COPY ./artifacts/polkadot /usr/local/bin
# add polkadot binaries to docker image
COPY ./artifacts/polkadot ./artifacts/polkadot-execute-worker ./artifacts/polkadot-prepare-worker /usr/local/bin

USER polkadot

# check if executable works in this container
RUN /usr/local/bin/polkadot --version
RUN /usr/local/bin/polkadot-execute-worker --version
RUN /usr/local/bin/polkadot-prepare-worker --version

EXPOSE 30333 9933 9944
VOLUME ["/polkadot"]
Expand Down
2 changes: 2 additions & 0 deletions docker/polkadot_injected_release.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ USER polkadot

# check if executable works in this container
RUN /usr/bin/polkadot --version
RUN /usr/local/bin/polkadot-execute-worker --version
RUN /usr/local/bin/polkadot-prepare-worker --version

EXPOSE 30333 9933 9944
VOLUME ["/polkadot"]
Expand Down
2 changes: 1 addition & 1 deletion docs/STYLE_GUIDE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Style Guide for Rust in Substrate
title: Style Guide for Rust in the Polkadot-SDK
---

Where possible these styles are enforced by settings in `rustfmt.toml` so if you run `cargo fmt`
Expand Down
10 changes: 10 additions & 0 deletions polkadot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,16 @@ assets = [
"/usr/bin/",
"755",
],
[
"target/release/polkadot-prepare-worker",
"/usr/lib/polkadot/",
"755"
],
[
"target/release/polkadot-execute-worker",
"/usr/lib/polkadot/",
"755"
],
[
"scripts/packaging/polkadot.service",
"/lib/systemd/system/",
Expand Down

0 comments on commit e40235d

Please sign in to comment.