From 510956f24410205cb9e0496c07f20cdfb0ffe403 Mon Sep 17 00:00:00 2001 From: Fahrrader Date: Wed, 18 Jan 2023 12:39:01 +0000 Subject: [PATCH] ci(collators): fix naming and arguments --- --- 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 --- a/.github/workflows/collator-selection.yml +++ b/.github/workflows/collator-selection.yml @@ -40,7 +40,7 @@ runs-on: [self-hosted-ci,large] timeout-minutes: 1380 - name: ${{ matrix.network }}-build + name: ${{ matrix.network }} strategy: matrix: include: ${{fromJson(needs.execution-marix.outputs.matrix)}} -- gitstuff