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
--- 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
39 uses: CertainLach/create-matrix-action@v439 uses: CertainLach/create-matrix-action@v4
40 id: create_matrix40 id: create_matrix
41 with:41 with:
42 matrix: |42 matrix: |
43 network {opal}43 network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}
44 network {quartz}44 network {quartz}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}
45 network {unique}45 network {unique}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}
4646
47 testnet-build:47 testnet-build:
48 needs: prepare-execution-marix48 needs: prepare-execution-marix
80 with:80 with:
81 template: .docker/Dockerfile-testnet.j281 template: .docker/Dockerfile-testnet.j2
82 output_file: .docker/Dockerfile-testnet.${{ matrix.network }}.yml82 output_file: .docker/Dockerfile-testnet.${{ matrix.network }}.yml
83 variables: |83 variables: |
84 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}84 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
85 NETWORK=${{ matrix.network }}85 NETWORK=${{ matrix.network }}
86 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}86 POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}
87 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}87 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
88 NETWORK=${{ matrix.network }}88 NETWORK=${{ matrix.network }}
89 BRANCH=${{ github.head_ref }}89 BRANCH=${{ github.head_ref }}
9090
91 - name: Show build configuration91 - name: Show build configuration
92 run: cat .docker/Dockerfile-testnet.${{ matrix.network }}.yml92 run: cat .docker/Dockerfile-testnet.${{ matrix.network }}.yml
109 password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}109 password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}
110110
111 - name: Pull polkadot docker image111 - name: Pull polkadot docker image
112 run: docker pull uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }} 112 run: docker pull uniquenetwork/builder-polkadot:${{ matrix.relay_branch }}
113113
114 - name: Build the stack114 - name: Build the stack
115 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 }} . 115 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 }} .