difftreelog
Merge branch 'CI-86-87-XCM-docker' into feature/multi-assets-redone
in: master
5 files changed
.docker/Dockerfile-xcm.j2diffbeforeafterboth--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -39,6 +39,7 @@
COPY ./xcm-config/launch-config-xcm-{{ NETWORK }}.json ./launch-config-xcm-{{ NETWORK }}.json
COPY ./xcm-config/5validators.jsonnet ./5validators.jsonnet
+COPY ./xcm-config/minBondFix.jsonnet ./minBondFix.jsonnet
RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
cd unique-chain && \
@@ -129,9 +130,11 @@
npm install --global yarn && \
yarn install
-COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
COPY --from=builder-unique /unique_parachain/launch-config-xcm-{{ NETWORK }}.json /polkadot-launch/
COPY --from=builder-unique /unique_parachain/5validators.jsonnet /polkadot-launch/5validators.jsonnet
+COPY --from=builder-unique /unique_parachain/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet
+
+COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
COPY --from=builder-moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/
COPY --from=builder-cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus
.docker/xcm-config/launch-config-xcm-quartz.jsondiffbeforeafterboth--- a/.docker/xcm-config/launch-config-xcm-quartz.json
+++ b/.docker/xcm-config/launch-config-xcm-quartz.json
@@ -118,6 +118,11 @@
"id": 2023,
"balance": "1000000000000000000000",
"chain": "moonriver-local",
+ "chainInitializer": [
+ "chainql",
+ "--tla-code=spec=import '${spec}'",
+ "minBondFix.jsonnet"
+ ],
"nodes": [
{
"wsPort": 9947,
.docker/xcm-config/minBondFix.jsonnetdiffbeforeafterboth--- /dev/null
+++ b/.docker/xcm-config/minBondFix.jsonnet
@@ -0,0 +1,10 @@
+function(spec)
+spec {
+ genesis+: {
+ runtime+: {
+ parachainStaking+: {
+ candidates: std.map(function(candidate) [candidate[0], candidate[1] * 1000], super.candidates)
+ },
+ },
+ },
+}
.envdiffbeforeafterboth--- a/.env
+++ b/.env
@@ -2,12 +2,12 @@
POLKADOT_BUILD_BRANCH=release-v0.9.27
POLKADOT_MAINNET_BRANCH=release-v0.9.26
-UNIQUE_MAINNET_TAG=feature/multi-assets-redone
+UNIQUE_MAINNET_TAG=v924010
KUSAMA_MAINNET_BRANCH=release-v0.9.26
-QUARTZ_MAINNET_TAG=feature/multi-assets-redone
+QUARTZ_MAINNET_TAG=quartz-v924012-2
-OPAL_MAINNET_TAG=feature/multi-assets-redone
+UNQWND_MAINNET_BRANCH=release-v0.9.24
OPAL_REPLICA_FROM=wss://eu-ws-opal.unique.network:443
QUARTZ_REPLICA_FROM=wss://eu-ws-quartz.unique.network:443
.github/workflows/xcm-testnet.ymldiffbeforeafterboth1name: xcm testnet23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6 pull_request:7 branches:8 - master9 types:10 - opened11 - reopened12 - synchronize #commit(s) pushed to the pull request13 - ready_for_review1415 # Allows you to run this workflow manually from the Actions tab16 workflow_dispatch:1718#Define Workflow variables19env:20 REPO_URL: ${{ github.server_url }}/${{ github.repository }}2122concurrency:23 group: ${{ github.workflow }}-${{ github.ref }}24 cancel-in-progress: true2526# A workflow run is made up of one or more jobs that can run sequentially or in parallel27jobs:2829 prepare-execution-marix:3031 name: Prepare execution matrix3233 runs-on: XL234 outputs:35 matrix: ${{ steps.create_matrix.outputs.matrix }}3637 steps:3839 - name: Clean Workspace40 uses: AutoModality/action-clean@v1.1.04142 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it43 - uses: actions/checkout@v344 with:45 ref: ${{ github.head_ref }} #Checking out head commit4647 - name: Read .env file48 uses: xom9ikk/dotenv@v1.0.24950 - name: Create Execution matrix51 uses: fabiocaccamo/create-matrix-action@v252 id: create_matrix53 with:54 matrix: |55 network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}56 network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}57 network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}5859 xcm-build:60 needs: prepare-execution-marix61 # The type of runner that the job will run on62 runs-on: [XL2]6364 timeout-minutes: 6006566 name: ${{ matrix.network }}6768 continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.6970 strategy:71 matrix:72 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}737475 steps:76 #- name: Skip if pull request is in Draft77 # `if: github.event.pull_request.draft == true` should be kept here, at78 # the step level, rather than at the job level. The latter is not79 # recommended because when the PR is moved from "Draft" to "Ready to80 # review" the workflow will immediately be passing (since it was skipped),81 # even though it hasn't actually ran, since it takes a few seconds for82 # the workflow to start. This is also disclosed in:83 # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1784 # That scenario would open an opportunity for the check to be bypassed:85 # 1. Get your PR approved86 # 2. Move it to Draft87 # 3. Push whatever commits you want88 # 4. Move it to "Ready for review"; now the workflow is passing (it was89 # skipped) and "Check reviews" is also passing (it won't be updated90 # until the workflow is finished)91 # if: github.event.pull_request.draft == true92 #run: exit 19394 - name: Clean Workspace95 uses: AutoModality/action-clean@v1.1.09697 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it98 - uses: actions/checkout@v399 with:100 ref: ${{ github.head_ref }} #Checking out head commit101102 - name: Read .env file103 uses: xom9ikk/dotenv@v1.0.2104105 - name: Generate ENV related extend Dockerfile file106 uses: cuchi/jinja2-action@v1.2.0107 with:108 template: .docker/Dockerfile-xcm.j2109 output_file: .docker/Dockerfile-xcm.${{ matrix.network }}.yml110 variables: |111 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}112 NETWORK=${{ matrix.network }}113 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}114 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}115 FEATURE=${{ matrix.features }}116 RUNTIME=${{ matrix.runtime }}117 BRANCH=${{ mainnet_branch }}118 ACALA_BUILD_BRANCH=${{ env.ACALA_BUILD_BRANCH }}119 MOONBEAM_BUILD_BRANCH=${{ env.MOONBEAM_BUILD_BRANCH }}120 CUMULUS_BUILD_BRANCH=${{ env.CUMULUS_BUILD_BRANCH }}121122 - name: Show build Dockerfile123 run: cat .docker/Dockerfile-xcm.${{ matrix.network }}.yml124125 - name: Show launch-config-xcm-${{ matrix.network }} configuration126 run: cat .docker/xcm-config/launch-config-xcm-${{ matrix.network }}.json127128 - name: Build the stack129 run: cd .docker/ && docker build --file ./Dockerfile-xcm.${{ matrix.network }}.yml --tag xcm-nodes-${{ matrix.network }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ mainnet_branch }}-${{ github.sha }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest .130131 # - name: Collect Docker Logs132 # if: success() || failure()133 # uses: jwalton/gh-docker-logs@v2.2.0134 # with:135 # dest: './xcm-build-logs.${{ matrix.features }}'136 # images: 'xcm-nodes-${{ matrix.network }}'137138 # - name: Show docker logs139 # if: success() || failure()140 # run: cat './xcm-build-logs.${{ matrix.features }}/xcm-nodes-${{ matrix.network }}.log'141142 - name: Log in to Docker Hub143 uses: docker/login-action@v2.0.0144 with:145 username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}146 password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}147148 - name: Push docker version image 149 run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ mainnet_branch }}-${{ github.sha }}150151 - name: Push docker image latest152 run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest1name: xcm testnet23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6 pull_request:7 branches:8 - master9 types:10 - opened11 - reopened12 - synchronize #commit(s) pushed to the pull request13 - ready_for_review1415 # Allows you to run this workflow manually from the Actions tab16 workflow_dispatch:1718#Define Workflow variables19env:20 REPO_URL: ${{ github.server_url }}/${{ github.repository }}2122concurrency:23 group: ${{ github.workflow }}-${{ github.ref }}24 cancel-in-progress: true2526# A workflow run is made up of one or more jobs that can run sequentially or in parallel27jobs:2829 prepare-execution-marix:3031 name: Prepare execution matrix3233 runs-on: XL234 outputs:35 matrix: ${{ steps.create_matrix.outputs.matrix }}3637 steps:3839 - name: Clean Workspace40 uses: AutoModality/action-clean@v1.1.04142 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it43 - uses: actions/checkout@v344 with:45 ref: ${{ github.head_ref }} #Checking out head commit4647 - name: Read .env file48 uses: xom9ikk/dotenv@v1.0.24950 - name: Create Execution matrix51 uses: fabiocaccamo/create-matrix-action@v252 id: create_matrix53 with:54 matrix: |55 network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}56 network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}57 network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}5859 xcm-build:60 needs: prepare-execution-marix61 # The type of runner that the job will run on62 runs-on: [XL2]6364 timeout-minutes: 6006566 name: ${{ matrix.network }}6768 continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.6970 strategy:71 matrix:72 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}737475 steps:76 #- name: Skip if pull request is in Draft77 # `if: github.event.pull_request.draft == true` should be kept here, at78 # the step level, rather than at the job level. The latter is not79 # recommended because when the PR is moved from "Draft" to "Ready to80 # review" the workflow will immediately be passing (since it was skipped),81 # even though it hasn't actually ran, since it takes a few seconds for82 # the workflow to start. This is also disclosed in:83 # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1784 # That scenario would open an opportunity for the check to be bypassed:85 # 1. Get your PR approved86 # 2. Move it to Draft87 # 3. Push whatever commits you want88 # 4. Move it to "Ready for review"; now the workflow is passing (it was89 # skipped) and "Check reviews" is also passing (it won't be updated90 # until the workflow is finished)91 # if: github.event.pull_request.draft == true92 #run: exit 19394 - name: Clean Workspace95 uses: AutoModality/action-clean@v1.1.09697 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it98 - uses: actions/checkout@v399 with:100 ref: ${{ github.head_ref }} #Checking out head commit101102 - name: Read .env file103 uses: xom9ikk/dotenv@v1.0.2104105 - name: Generate ENV related extend Dockerfile file106 uses: cuchi/jinja2-action@v1.2.0107 with:108 template: .docker/Dockerfile-xcm.j2109 output_file: .docker/Dockerfile-xcm.${{ matrix.network }}.yml110 variables: |111 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}112 NETWORK=${{ matrix.network }}113 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}114 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}115 FEATURE=${{ matrix.features }}116 RUNTIME=${{ matrix.runtime }}117 BRANCH=${{ github.head_ref }}118 ACALA_BUILD_BRANCH=${{ env.ACALA_BUILD_BRANCH }}119 MOONBEAM_BUILD_BRANCH=${{ env.MOONBEAM_BUILD_BRANCH }}120 CUMULUS_BUILD_BRANCH=${{ env.CUMULUS_BUILD_BRANCH }}121122 - name: Show build Dockerfile123 run: cat .docker/Dockerfile-xcm.${{ matrix.network }}.yml124125 - name: Show launch-config-xcm-${{ matrix.network }} configuration126 run: cat .docker/xcm-config/launch-config-xcm-${{ matrix.network }}.json127128 - name: Build the stack129 run: cd .docker/ && docker build --file ./Dockerfile-xcm.${{ matrix.network }}.yml --tag xcm-nodes-${{ matrix.network }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ github.head_ref }}-${{ github.sha }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest .130131 # - name: Collect Docker Logs132 # if: success() || failure()133 # uses: jwalton/gh-docker-logs@v2.2.0134 # with:135 # dest: './xcm-build-logs.${{ matrix.features }}'136 # images: 'xcm-nodes-${{ matrix.network }}'137138 # - name: Show docker logs139 # if: success() || failure()140 # run: cat './xcm-build-logs.${{ matrix.features }}/xcm-nodes-${{ matrix.network }}.log'141142 - name: Log in to Docker Hub143 uses: docker/login-action@v2.0.0144 with:145 username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}146 password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}147148 - name: Push docker version image 149 run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ github.head_ref }}-${{ github.sha }}150151 - name: Push docker image latest152 run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest