git.delta.rocks / unique-network / refs/commits / 510956f24410

difftreelog

ci(collators) fix naming and arguments

Fahrrader2023-01-18parent: #15ad777.patch.diff
in: master

2 files changed

modified.docker/Dockerfile-collatorsdiffbeforeafterboth
--- a/.docker/Dockerfile-collators
+++ b/.docker/Dockerfile-collators
@@ -1,3 +1,6 @@
+ARG POLKADOT_BUILD_BRANCH
+FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
+
 # ===== Rust builder =====
 FROM uniquenetwork/services:latest as rust-builder
 ARG RUST_TOOLCHAIN=
@@ -22,6 +25,7 @@
 
 ARG PROFILE=release
 ARG NETWORK
+ARG POLKADOT_LAUNCH_BRANCH
 ARG BRANCH
 
 WORKDIR /unique_parachain
@@ -33,7 +37,6 @@
 # ===== RUN ======
 
 FROM ubuntu:20.04
-ARG POLKADOT_LAUNCH_BRANCH
 
 RUN apt-get -y update && \
       apt-get -y install curl git && \
@@ -54,7 +57,7 @@
 COPY --from=builder-unique /unique_parachain/unique-chain/.docker/testnet-config/launch-config.json /polkadot-launch/launch-config.json
 COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
 
-COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 
 EXPOSE 9844
 EXPOSE 9944
modified.github/workflows/collator-selection.ymldiffbeforeafterboth
40 runs-on: [self-hosted-ci,large]40 runs-on: [self-hosted-ci,large]
41 timeout-minutes: 138041 timeout-minutes: 1380
4242
43 name: ${{ matrix.network }}-build43 name: ${{ matrix.network }}
44 strategy:44 strategy:
45 matrix:45 matrix:
46 include: ${{fromJson(needs.execution-marix.outputs.matrix)}}46 include: ${{fromJson(needs.execution-marix.outputs.matrix)}}