--- a/.docker/Dockerfile-parachain-upgrade-data.j2 +++ b/.docker/Dockerfile-parachain-upgrade-data.j2 @@ -1,4 +1,3 @@ -ARG POLKADOT_BUILD_BRANCH FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot # ===== Rust builder ===== --- a/.docker/Dockerfile-parachain-upgrade.j2 +++ b/.docker/Dockerfile-parachain-upgrade.j2 @@ -1,4 +1,3 @@ -ARG POLKADOT_BUILD_BRANCH FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot # ===== Rust builder ===== --- a/.env +++ b/.env @@ -1,5 +1,4 @@ RUST_TOOLCHAIN=nightly-2022-11-15 -POLKADOT_BUILD_BRANCH=release-v0.9.37 POLKADOT_LAUNCH_BRANCH=unique-network RELAY_CHAIN_TYPE=westend --- a/.github/workflows/collator-selection.yml +++ b/.github/workflows/collator-selection.yml @@ -67,7 +67,7 @@ output_file: .docker/docker-compose.collators.${{ matrix.network }}.yml variables: | RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} - POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }} + POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }} POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }} NETWORK=${{ matrix.network }} BRANCH=${{ github.head_ref }} --- a/.github/workflows/market-test.yml +++ b/.github/workflows/market-test.yml @@ -23,7 +23,7 @@ strategy: matrix: include: - - network: "opal" + - network: "opal", relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}} steps: - name: Clean Workspace @@ -58,7 +58,7 @@ variables: | REPO_URL=${{ github.server_url }}/${{ github.repository }}.git RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} - POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }} + POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }} POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }} NETWORK=${{ matrix.network }} BRANCH=${{ github.head_ref }} --- a/.github/workflows/testnet-build.yml +++ b/.github/workflows/testnet-build.yml @@ -40,9 +40,9 @@ id: create_matrix with: matrix: | - network {opal} - network {quartz} - network {unique} + network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}} + network {quartz}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}} + network {unique}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}} testnet-build: needs: prepare-execution-marix @@ -83,7 +83,7 @@ variables: | RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} NETWORK=${{ matrix.network }} - POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }} + POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }} POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }} NETWORK=${{ matrix.network }} BRANCH=${{ github.head_ref }} @@ -109,7 +109,7 @@ password: ${{ secrets.CORE_DOCKERHUB_TOKEN }} - name: Pull polkadot docker image - run: docker pull uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }} + run: docker pull uniquenetwork/builder-polkadot:${{ matrix.relay_branch }} - name: Build the stack run: cd .docker/ && docker build --file ./Dockerfile-testnet.${{ matrix.network }}.yml --tag uniquenetwork/${{ matrix.network }}-testnet-local-nightly:nightly-${{ steps.branchname.outputs.value }}-${{ github.sha }} .