git.delta.rocks / unique-network / refs/commits / 911b14059b3c

difftreelog

delete variable POLKADOT_BUILD_BRANCH from .env in CI

Konstantin Astakhov2023-04-26parent: #6e3cf5e.patch.diff
in: master

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
@@ -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 }}
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 }} .