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
1ARG POLKADOT_BUILD_BRANCH
2FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot1FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot
32
4# ===== Rust builder =====3# ===== Rust builder =====
modified.docker/Dockerfile-parachain-upgrade.j2diffbeforeafterboth
1ARG POLKADOT_BUILD_BRANCH
2FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot1FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot
32
4# ===== Rust builder =====3# ===== Rust builder =====
modified.envdiffbeforeafterboth
1RUST_TOOLCHAIN=nightly-2022-11-151RUST_TOOLCHAIN=nightly-2022-11-15
2POLKADOT_BUILD_BRANCH=release-v0.9.37
3POLKADOT_LAUNCH_BRANCH=unique-network2POLKADOT_LAUNCH_BRANCH=unique-network
4RELAY_CHAIN_TYPE=westend3RELAY_CHAIN_TYPE=westend
54
modified.github/workflows/collator-selection.ymldiffbeforeafterboth
65        with:65        with:
66          template: .docker/docker-compose.tmp-collators.j266          template: .docker/docker-compose.tmp-collators.j2
67          output_file: .docker/docker-compose.collators.${{ matrix.network }}.yml67          output_file: .docker/docker-compose.collators.${{ matrix.network }}.yml
68          variables: |68          variables: |
69            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}69            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
70            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}70            POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}
71            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}71            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
72            NETWORK=${{ matrix.network }}72            NETWORK=${{ matrix.network }}
73            BRANCH=${{ github.head_ref }}73            BRANCH=${{ github.head_ref }}
7474
75      - name: Show build configuration75      - name: Show build configuration
76        run: cat .docker/docker-compose.collators.${{ matrix.network }}.yml76        run: cat .docker/docker-compose.collators.${{ matrix.network }}.yml
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
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 }} .