git.delta.rocks / unique-network / refs/commits / b86b27d80045

difftreelog

Merge pull request #926 from UniqueNetwork/ci/fix_env

Yaroslav Bolyukin2023-04-28parents: #9f5b0cc #fedfe1a.patch.diff
in: master
delete variable POLKADOT_BUILD_BRANCH from .env in CI

6 files changed

modified.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 =====
modified.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 =====
modified.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
 
modified.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 }}
modified.github/workflows/market-test.ymldiffbeforeafterboth
11# 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 parallel
12jobs:12jobs:
13
14 prepare-execution-marix:
15
16 name: Prepare execution matrix
17
18 runs-on: [self-hosted-ci]
19 outputs:
20 matrix: ${{ steps.create_matrix.outputs.matrix }}
21
22 steps:
23
24 - name: Clean Workspace
25 uses: AutoModality/action-clean@v1.1.0
26
27 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
28 - uses: actions/checkout@v3.1.0
29 with:
30 ref: ${{ github.head_ref }} #Checking out head commit
31
32 - name: Read .env file
33 uses: xom9ikk/dotenv@v2
34
35 - name: Create Execution matrix
36 uses: CertainLach/create-matrix-action@v4
37 id: create_matrix
38 with:
39 matrix: |
40 network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}
41
1342
14 market_test:43 market_test:
44 needs: prepare-execution-marix
15 # The type of runner that the job will run on45 # The type of runner that the job will run on
16 runs-on: [self-hosted-ci,large]46 runs-on: [self-hosted-ci,large]
17 timeout-minutes: 36047 timeout-minutes: 360
22 52
23 strategy:53 strategy:
24 matrix:54 matrix:
25 include:55 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}
26 - network: "opal"
2756
28 steps:57 steps:
29 - name: Clean Workspace58 - name: Clean Workspace
55 with:84 with:
56 template: qa-tests/.docker/docker-compose.tmp-market.j285 template: qa-tests/.docker/docker-compose.tmp-market.j2
57 output_file: qa-tests/.docker/docker-compose.${{ matrix.network }}.yml86 output_file: qa-tests/.docker/docker-compose.${{ matrix.network }}.yml
58 variables: |87 variables: |
59 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git88 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
60 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 }}
6594
6695
67 - name: Show build configuration96 - name: Show build configuration
modified.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 }} .