git.delta.rocks / unique-network / refs/commits / 6a76cbbd1386

difftreelog

update forkless with data workflow

Konstantin Astakhov2022-10-31parent: #4ed64c2.patch.diff
in: master

2 files changed

modified.docker/docker-compose.tmp-forkless-data.j2diffbeforeafterboth
before · .docker/docker-compose.tmp-forkless-data.j2
1version: "3.5"23services:4  node-parachain:5    build:6      args:7        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"8        - "BRANCH={{ BRANCH }}"9        - "REPO_URL={{ REPO_URL }}"10        - "NETWORK"={{ NETWORK }}"11        - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"12        - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"13        - "MAINNET_TAG={{ MAINNET_TAG }}"14        - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"15        - "REPLICA_FROM={{ REPLICA_FROM }}"16      context: ../17      dockerfile: .docker/Dockerfile-parachain-upgrade-data18    image: node-parachain19    container_name: node-parachain20    volumes:21       - type: bind22         source: ./launch-config-forkless-data.json23         target: /polkadot-launch/launch-config.json24         read_only: true25       - type: bind26         source: ./forkless-config/fork.jsonnet27         target: /polkadot-launch/fork.jsonnet28         read_only: true29       - type: bind30         source: ./forkless-config/typeNames.jsonnet31         target: /polkadot-launch/typeNames.jsonnet32         read_only: true33    expose:34      - 994435      - 993336    ports:37      - 127.0.0.1:9944:994438      - 127.0.0.1:9933:993339    logging:40      options:41        max-size: "1m"42        max-file: "3"
after · .docker/docker-compose.tmp-forkless-data.j2
1version: "3.5"23services:4  node-parachain:5    build:6      args:7        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"8        - "BRANCH={{ BRANCH }}"9        - "REPO_URL={{ REPO_URL }}"10        - "NETWORK={{ NETWORK }}"11        - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"12        - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"13        - "MAINNET_TAG={{ MAINNET_TAG }}"14        - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"15        - "REPLICA_FROM={{ REPLICA_FROM }}"16      context: ../17      dockerfile: .docker/Dockerfile-parachain-upgrade-data18    image: node-parachain19    container_name: node-parachain20    volumes:21       - type: bind22         source: ./launch-config-forkless-data.json23         target: /polkadot-launch/launch-config.json24         read_only: true25       - type: bind26         source: ./forkless-config/fork.jsonnet27         target: /polkadot-launch/fork.jsonnet28         read_only: true29       - type: bind30         source: ./forkless-config/typeNames.jsonnet31         target: /polkadot-launch/typeNames.jsonnet32         read_only: true33    expose:34      - 994435      - 993336    ports:37      - 127.0.0.1:9944:994438      - 127.0.0.1:9933:993339    logging:40      options:41        max-size: "1m"42        max-file: "3"
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -52,7 +52,6 @@
 
     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.
 
-
     steps:
       - name: Clean Workspace
         uses: AutoModality/action-clean@v1.1.0
@@ -69,7 +68,7 @@
         uses: cuchi/jinja2-action@v1.2.0
         with:
           template: .docker/docker-compose.tmp-forkless-data.j2
-          output_file: .docker/docker-compose.${{ matrix.network }}.yml
+          output_file: .docker/docker-compose-forkless-data.${{ matrix.network }}.yml
           variables: |
             REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
@@ -83,7 +82,7 @@
             REPLICA_FROM=${{ matrix.replica_from_address }}
 
       - name: Show build configuration
-        run: cat .docker/docker-compose.${{ matrix.network }}.yml
+        run: cat .docker/docker-compose-forkless-data.${{ matrix.network }}.yml
 
       - name: Generate launch-config-forkless-data.json
         uses: cuchi/jinja2-action@v1.2.0
@@ -97,9 +96,8 @@
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-data.json
 
-
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300
+        run: docker-compose -f ".docker/docker-compose-forkless-data.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300
 
       - name: Check if docker logs consist logs related to Runtime Upgrade testing.
         if: success()
@@ -161,7 +159,7 @@
 
       - name: Stop running containers
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down --volumes
+        run: docker-compose -f ".docker/docker-compose-forkless-data.${{ matrix.network }}.yml" down --volumes
         
       - name: Remove builder cache
         if: always()                   # run this step always