git.delta.rocks / unique-network / refs/commits / d2043ffafec9

difftreelog

update dockerfile for try runtime

Alexander Aksenov2022-08-16parent: #3d43cce.patch.diff
in: master

3 files changed

modified.docker/Dockerfile-try-runtimediffbeforeafterboth
--- a/.docker/Dockerfile-try-runtime
+++ b/.docker/Dockerfile-try-runtime
@@ -36,38 +36,10 @@
 ARG FEATURE=
 ARG REPO_URL=
 ARG BRANCH=
-
-RUN git clone $REPO_URL -b $BRANCH . && \
-    cargo build --features=$FEATURE --$PROFILE
-
-
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-ARG POLKADOT_BUILD_BRANCH=
-ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
+ARG FORK_FROM=
 
-RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
-RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
-    cd polkadot && \
-    cargo build --release
+RUN git clone $REPO_URL -b $BRANCH . && \
+    cargo run --features=FEATURE --release -- try-runtime on-runtime-upgrade live --uri $FORK_FROM
 
-# ===== RUN ======
-
-FROM ubuntu:20.04
-
-ARG FORM_FROM=
-ARG FEATURE=
-
-RUN apt-get -y update && \
-      apt-get -y install curl git && \
-      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
-      export NVM_DIR="$HOME/.nvm" && \
-      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-      nvm install v16.16.0 && \
-      nvm use v16.16.0
-
-COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
-COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
\ No newline at end of file
modified.docker/docker-compose.try-runtime.j2diffbeforeafterboth
--- a/.docker/docker-compose.try-runtime.j2
+++ b/.docker/docker-compose.try-runtime.j2
@@ -8,8 +8,5 @@
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
         - "FEATURE={{ FEATURE }}"
-        - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "FORK_FROM={{ FORK_FROM }}"
-
-    command: cargo run --features=$FEATURE --release -- try-runtime on-runtime-upgrade live --uri $FORK_FROM
 
modified.github/workflows/try-runtime.ymldiffbeforeafterboth
before · .github/workflows/try-runtime.yml
1name: Try Runtime23# 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 }}2122# A workflow run is made up of one or more jobs that can run sequentially or in parallel23jobs:24  fork-update-withdata:25    # The type of runner that the job will run on26    runs-on: self-hosted-ci2728    name: Build Container, Spin it Up an test2930    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.3132    strategy:33      matrix:34        include:35          - network: Opal36            features: try-runtime,opal-runtime37            fork_from_address: wss://eu-ws-opal.unique.network:44338          - network: Quartz39            features: try-runtime,quartz-runtime40            fork_from_address: wss://eu-ws-quartz.unique.network:44341          - network: Unique42            features: try-runtime,unique-runtime43            fork_from_address: wss://eu-ws.unique.network:4434445    steps:46#      - name: Skip if pull request is in Draft47        # `if: github.event.pull_request.draft == true` should be kept here, at48        # the step level, rather than at the job level. The latter is not49        # recommended because when the PR is moved from "Draft" to "Ready to50        # review" the workflow will immediately be passing (since it was skipped),51        # even though it hasn't actually ran, since it takes a few seconds for52        # the workflow to start. This is also disclosed in:53        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1754        # That scenario would open an opportunity for the check to be bypassed:55        # 1. Get your PR approved56        # 2. Move it to Draft57        # 3. Push whatever commits you want58        # 4. Move it to "Ready for review"; now the workflow is passing (it was59        #    skipped) and "Check reviews" is also passing (it won't be updated60        #    until the workflow is finished)61#        if: github.event.pull_request.draft == true62#        run: exit 1636465      - name: Clean Workspace66        uses: AutoModality/action-clean@v1.1.06768      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it69      - uses: actions/checkout@v370        with:71          ref: ${{ github.head_ref }}  #Checking out head commit7273      - name: Read .env file74        uses: xom9ikk/dotenv@v1.0.27576      - name: Generate ENV related extend file for docker-compose77        uses: cuchi/jinja2-action@v1.2.078        with:79          template: .docker/docker-compose.try-runtime.j280          output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml81          variables: |82            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git83            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}84            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}85            FEATURE=${{ matrix.features }}86            BRANCH=${{ github.head_ref }}87            FORK_FROM=${{ matrix.fork_from_address }}8889      - name: Show build configuration90        run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml919293      - name: Build the stack94        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300959697      - name: Collect Docker Logs98        if: success() || failure()99        uses: jwalton/gh-docker-logs@v2.2.0100        with:101          dest: './try-runtime-logs.${{ matrix.features }}'102          images: 'try-runtime' 103104      - name: Tar logs105        if: success() || failure()106        run: tar cvzf ./try-runtime-logs.${{ matrix.features }}.tgz ./try-runtime-logs.${{ matrix.features }}107108      - name: Upload logs to GitHub109        if: success() || failure()110        uses: actions/upload-artifact@master111        with:112          name: try-runtime-logs.${{ matrix.features }}.tgz113          path: ./try-runtime-logs.${{ matrix.features }}.tgz114115      - name: Stop running containers116        if: always()                   # run this step always117        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" down
after · .github/workflows/try-runtime.yml
1name: Try Runtime23# 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 }}2122# A workflow run is made up of one or more jobs that can run sequentially or in parallel23jobs:24  try-runtime:25    # The type of runner that the job will run on26    runs-on: self-hosted-ci2728    name: ${{ matrix.network }} - Try-runtime2930    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.3132    strategy:33      matrix:34        include:35          - network: Opal36            features: try-runtime,opal-runtime37            fork_from_address: wss://eu-ws-opal.unique.network:44338          - network: Quartz39            features: try-runtime,quartz-runtime40            fork_from_address: wss://eu-ws-quartz.unique.network:44341          - network: Unique42            features: try-runtime,unique-runtime43            fork_from_address: wss://eu-ws.unique.network:4434445    steps:46      - name: Skip if pull request is in Draft47        # `if: github.event.pull_request.draft == true` should be kept here, at48        # the step level, rather than at the job level. The latter is not49        # recommended because when the PR is moved from "Draft" to "Ready to50        # review" the workflow will immediately be passing (since it was skipped),51        # even though it hasn't actually ran, since it takes a few seconds for52        # the workflow to start. This is also disclosed in:53        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1754        # That scenario would open an opportunity for the check to be bypassed:55        # 1. Get your PR approved56        # 2. Move it to Draft57        # 3. Push whatever commits you want58        # 4. Move it to "Ready for review"; now the workflow is passing (it was59        #    skipped) and "Check reviews" is also passing (it won't be updated60        #    until the workflow is finished)61        if: github.event.pull_request.draft == true62        run: exit 1636465      - name: Clean Workspace66        uses: AutoModality/action-clean@v1.1.06768      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it69      - uses: actions/checkout@v370        with:71          ref: ${{ github.head_ref }}  #Checking out head commit7273      - name: Read .env file74        uses: xom9ikk/dotenv@v1.0.27576      - name: Generate ENV related extend file for docker-compose77        uses: cuchi/jinja2-action@v1.2.078        with:79          template: .docker/docker-compose.try-runtime.j280          output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml81          variables: |82            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git83            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}84            FEATURE=${{ matrix.features }}85            BRANCH=${{ github.head_ref }}86            FORK_FROM=${{ matrix.fork_from_address }}8788      - name: Show build configuration89        run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml909192      - name: Build the stack93        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300949596      - name: Collect Docker Logs97        if: success() || failure()98        uses: jwalton/gh-docker-logs@v2.2.099        with:100          dest: './try-runtime-logs.${{ matrix.features }}'101          images: 'try-runtime' 102103      - name: Tar logs104        if: success() || failure()105        run: tar cvzf ./try-runtime-logs.${{ matrix.features }}.tgz ./try-runtime-logs.${{ matrix.features }}106107      - name: Upload logs to GitHub108        if: success() || failure()109        uses: actions/upload-artifact@master110        with:111          name: try-runtime-logs.${{ matrix.features }}.tgz112          path: ./try-runtime-logs.${{ matrix.features }}.tgz113114      - name: Stop running containers115        if: always()                   # run this step always116        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" down