From 129720800c3853ac87a75e02fbcce5b99b0bdc47 Mon Sep 17 00:00:00 2001 From: Konstantin Astakhov Date: Mon, 1 Apr 2024 19:36:21 +0700 Subject: [PATCH] fix for private frontier --- .docker/Dockerfile-chain-dev | 4 ++++ .docker/Dockerfile-chain-dev-unit | 4 ++++ .docker/Dockerfile-try-runtime.j2 | 4 ++++ .github/workflows/try-runtime.yml | 1 + .github/workflows/unit-test.yml | 1 + .github/workflows/yarn-dev.yml | 1 + 6 files changed, 15 insertions(+) diff --git a/.docker/Dockerfile-chain-dev b/.docker/Dockerfile-chain-dev index a19bf8c885..f2d2b80c79 100644 --- a/.docker/Dockerfile-chain-dev +++ b/.docker/Dockerfile-chain-dev @@ -21,6 +21,10 @@ COPY . /dev_chain WORKDIR /dev_chain +ARG GIT_PRIVATE_CREDENTIALS + +RUN git config --global url."https://$GIT_PRIVATE_CREDENTIALS@github.com".insteadOf ssh://git@github.com + RUN cargo build --profile integration-tests --features=${NETWORK}-runtime,fast-inflation RUN echo "$NETWORK" diff --git a/.docker/Dockerfile-chain-dev-unit b/.docker/Dockerfile-chain-dev-unit index 5ea2305bbe..b52245316f 100644 --- a/.docker/Dockerfile-chain-dev-unit +++ b/.docker/Dockerfile-chain-dev-unit @@ -17,4 +17,8 @@ COPY . /dev_chain WORKDIR /dev_chain +ARG GIT_PRIVATE_CREDENTIALS + +RUN git config --global url."https://$GIT_PRIVATE_CREDENTIALS@github.com".insteadOf ssh://git@github.com + CMD cargo test --features=limit-testing,tests --workspace diff --git a/.docker/Dockerfile-try-runtime.j2 b/.docker/Dockerfile-try-runtime.j2 index 9d6c24307f..7cbe4d1825 100644 --- a/.docker/Dockerfile-try-runtime.j2 +++ b/.docker/Dockerfile-try-runtime.j2 @@ -25,6 +25,10 @@ ARG PROFILE=release COPY . /unique_parachain WORKDIR /unique_parachain +ARG GIT_PRIVATE_CREDENTIALS + +RUN git config --global url."https://$GIT_PRIVATE_CREDENTIALS@github.com".insteadOf ssh://git@github.com + RUN echo "Requested features: {{ NETWORK }}-runtime\n" && \ echo "Fork from: {{ REPLICA_FROM }}\n" && \ cargo build --features=try-runtime,{{ NETWORK }}-runtime --release diff --git a/.github/workflows/try-runtime.yml b/.github/workflows/try-runtime.yml index 4cbebc2b92..88b0c75dc9 100644 --- a/.github/workflows/try-runtime.yml +++ b/.github/workflows/try-runtime.yml @@ -169,6 +169,7 @@ jobs: variables: | NETWORK=${{ matrix.network }} BUILD_TAG=${{ steps.branchname.outputs.value }}-$BUILD_SHA + GIT_PRIVATE_CREDENTIALS=${{ secrets.GIT_PRIVATE_CREDENTIALS }} - name: Show build configuration run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 6a399fb1df..8f9e3e230d 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -39,6 +39,7 @@ jobs: output_file: .docker/docker-compose.unit.yml variables: | RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} + GIT_PRIVATE_CREDENTIALS=${{ secrets.GIT_PRIVATE_CREDENTIALS }} - name: Show build configuration diff --git a/.github/workflows/yarn-dev.yml b/.github/workflows/yarn-dev.yml index bde90bd0d8..9e393eab16 100644 --- a/.github/workflows/yarn-dev.yml +++ b/.github/workflows/yarn-dev.yml @@ -49,6 +49,7 @@ jobs: variables: | RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} NETWORK=${{ matrix.network }} + GIT_PRIVATE_CREDENTIALS=${{ secrets.GIT_PRIVATE_CREDENTIALS }} - name: Show build configuration