difftreelog
Merge pull request #926 from UniqueNetwork/ci/fix_env
in: master
delete variable POLKADOT_BUILD_BRANCH from .env in CI
6 files changed
.docker/Dockerfile-parachain-upgrade-data.j2diffbeforeafterboth--- 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 =====
.docker/Dockerfile-parachain-upgrade.j2diffbeforeafterboth--- 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 =====
.envdiffbeforeafterboth--- 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
.github/workflows/collator-selection.ymldiffbeforeafterboth--- 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 }}
.github/workflows/market-test.ymldiffbeforeafterboth11# A workflow run is made up of one or more jobs that can run sequentially or in parallel11# A workflow run is made up of one or more jobs that can run sequentially or in parallel12jobs:12jobs:1314 prepare-execution-marix:1516 name: Prepare execution matrix1718 runs-on: [self-hosted-ci]19 outputs:20 matrix: ${{ steps.create_matrix.outputs.matrix }}2122 steps:2324 - name: Clean Workspace25 uses: AutoModality/action-clean@v1.1.02627 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it28 - uses: actions/checkout@v3.1.029 with:30 ref: ${{ github.head_ref }} #Checking out head commit3132 - name: Read .env file33 uses: xom9ikk/dotenv@v23435 - name: Create Execution matrix36 uses: CertainLach/create-matrix-action@v437 id: create_matrix38 with:39 matrix: |40 network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}41134214 market_test:43 market_test:44 needs: prepare-execution-marix15 # The type of runner that the job will run on45 # The type of runner that the job will run on16 runs-on: [self-hosted-ci,large]46 runs-on: [self-hosted-ci,large]17 timeout-minutes: 36047 timeout-minutes: 36022 52 23 strategy:53 strategy:24 matrix:54 matrix:25 include:55 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}26 - network: "opal"275628 steps:57 steps:29 - name: Clean Workspace58 - name: Clean Workspace55 with:84 with:56 template: qa-tests/.docker/docker-compose.tmp-market.j285 template: qa-tests/.docker/docker-compose.tmp-market.j257 output_file: qa-tests/.docker/docker-compose.${{ matrix.network }}.yml86 output_file: qa-tests/.docker/docker-compose.${{ matrix.network }}.yml58 variables: |87 variables: |59 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git88 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git60 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}89 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}61 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}90 POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}62 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}91 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}63 NETWORK=${{ matrix.network }}92 NETWORK=${{ matrix.network }}64 BRANCH=${{ github.head_ref }}93 BRANCH=${{ github.head_ref }}6594669567 - name: Show build configuration96 - name: Show build configuration.github/workflows/testnet-build.ymldiffbeforeafterboth--- 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 }} .