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
before · .env
1RUST_TOOLCHAIN=nightly-2022-11-152POLKADOT_BUILD_BRANCH=release-v0.9.373POLKADOT_LAUNCH_BRANCH=unique-network4RELAY_CHAIN_TYPE=westend56POLKADOT_MAINNET_BRANCH=release-v0.9.377STATEMINT_BUILD_BRANCH=release-parachains-v93708ACALA_BUILD_BRANCH=2.12.09MOONBEAM_BUILD_BRANCH=runtime-220110ASTAR_BUILD_BRANCH=v5.3.011UNIQUE_MAINNET_BRANCH=release-v93705312UNIQUE_REPLICA_FROM=wss://ws.unique.network:4431314KUSAMA_MAINNET_BRANCH=release-v0.9.3815STATEMINE_BUILD_BRANCH=release-parachains-v938216KARURA_BUILD_BRANCH=release-karura-2.15.017MOONRIVER_BUILD_BRANCH=runtime-220118SHIDEN_BUILD_BRANCH=v4.49.019QUARTZ_MAINNET_BRANCH=release-v93705320QUARTZ_REPLICA_FROM=wss://ws-quartz.unique.network:4432122UNIQUEWEST_MAINNET_BRANCH=release-v0.9.4023WESTMINT_BUILD_BRANCH=parachains-v940024OPAL_MAINNET_BRANCH=release-v93705325OPAL_REPLICA_FROM=wss://ws-opal.unique.network:4432627UNIQUEEAST_MAINNET_BRANCH=release-v0.9.3228SAPPHIRE_MAINNET_BRANCH=release-v93705329SAPPHIRE_REPLICA_FROM=wss://ws-sapphire.unique.network:443
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
--- a/.github/workflows/market-test.yml
+++ b/.github/workflows/market-test.yml
@@ -11,7 +11,37 @@
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
 
+  prepare-execution-marix:
+
+    name: Prepare execution matrix
+
+    runs-on: [self-hosted-ci]
+    outputs:
+      matrix: ${{ steps.create_matrix.outputs.matrix }}
+
+    steps:
+
+      - name: Clean Workspace
+        uses: AutoModality/action-clean@v1.1.0
+
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3.1.0
+        with:
+          ref: ${{ github.head_ref }}  #Checking out head commit
+
+      - name: Read .env file
+        uses: xom9ikk/dotenv@v2
+
+      - name: Create Execution matrix
+        uses: CertainLach/create-matrix-action@v4
+        id: create_matrix
+        with:
+          matrix: |
+            network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}
+
+
   market_test:
+    needs: prepare-execution-marix
     # The type of runner that the job will run on
     runs-on: [self-hosted-ci,large]
     timeout-minutes: 360
@@ -22,8 +52,7 @@
     
     strategy:
       matrix:
-        include:
-          - network: "opal"
+        include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}
 
     steps:
       - name: Clean Workspace
@@ -58,7 +87,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 }}
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 }} .