git.delta.rocks / unique-network / refs/commits / 246a7cb4abd7

difftreelog

Fixing spoted items.

Alexander Aksenov2022-08-05parent: #f946586.patch.diff
in: master

5 files changed

modified.docker/Dockerfile-parachaindiffbeforeafterboth
--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -23,7 +23,7 @@
 RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
 
 
-RUN mkdir unique_parachain
+RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
 # ===== BUILD ======
@@ -32,13 +32,11 @@
 ARG PROFILE=release
 ARG FEATURE=
 
-RUN mkdir unique_parachain
+RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $BRANCH
 RUN cargo build $FEATURE --$PROFILE
-   # && \
-   # cargo test
 
 # ===== BUILD POLKADOT =====
 FROM rust-builder as builder-polkadot
@@ -46,7 +44,7 @@
 ARG POLKA_VERSION=release-v0.9.24
 ENV POLKA_VERSION $POLKA_VERSION
 
-RUN mkdir unique_parachain
+RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
 RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
@@ -77,7 +75,7 @@
 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/
 
-COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]
+COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json
 
 
 CMD export NVM_DIR="$HOME/.nvm" && \
modified.github/workflows/codestyle.ymldiffbeforeafterboth
--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@ -14,6 +14,24 @@
     runs-on: self-hosted-ci
 
     steps:
+      - name: Skip if pull request is in Draft
+        # `if: github.event.pull_request.draft == true` should be kept here, at
+        # the step level, rather than at the job level. The latter is not
+        # recommended because when the PR is moved from "Draft" to "Ready to
+        # review" the workflow will immediately be passing (since it was skipped),
+        # even though it hasn't actually ran, since it takes a few seconds for
+        # the workflow to start. This is also disclosed in:
+        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
+        # That scenario would open an opportunity for the check to be bypassed:
+        # 1. Get your PR approved
+        # 2. Move it to Draft
+        # 3. Push whatever commits you want
+        # 4. Move it to "Ready for review"; now the workflow is passing (it was
+        #    skipped) and "Check reviews" is also passing (it won't be updated
+        #    until the workflow is finished)
+        if: github.event.pull_request.draft == true
+        run: exit 1
+
       - uses: actions/checkout@v1
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
@@ -30,6 +48,24 @@
     runs-on: self-hosted-ci
 
     steps:
+      - name: Skip if pull request is in Draft
+        # `if: github.event.pull_request.draft == true` should be kept here, at
+        # the step level, rather than at the job level. The latter is not
+        # recommended because when the PR is moved from "Draft" to "Ready to
+        # review" the workflow will immediately be passing (since it was skipped),
+        # even though it hasn't actually ran, since it takes a few seconds for
+        # the workflow to start. This is also disclosed in:
+        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
+        # That scenario would open an opportunity for the check to be bypassed:
+        # 1. Get your PR approved
+        # 2. Move it to Draft
+        # 3. Push whatever commits you want
+        # 4. Move it to "Ready for review"; now the workflow is passing (it was
+        #    skipped) and "Check reviews" is also passing (it won't be updated
+        #    until the workflow is finished)
+        if: github.event.pull_request.draft == true
+        run: exit 1
+        
       - uses: actions/checkout@v3
       - name: Install substrate dependencies
         run: sudo apt-get install libssl-dev pkg-config libclang-dev clang
modified.github/workflows/node_build_test.ymldiffbeforeafterboth
before · .github/workflows/node_build_test.yml
1name: Develop - Build & test23# 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      - develop9    types:10      - opened11      - reopened12      - synchronize   #commit(s) pushed to the pull request1314  # Allows you to run this workflow manually from the Actions tab15  workflow_dispatch:1617#Define Workflow variables18env:19  RUST_TOOLCHAIN: nightly-2022-05-1120  REPO_URL: ${{ github.server_url }}/${{ github.repository }}21  POLKA_VERSION: release-v0.9.242223# A workflow run is made up of one or more jobs that can run sequentially or in parallel24jobs:25  build:26    # The type of runner that the job will run on27    runs-on: self-hosted-ci2829    name: Build Container, Spin it Up an test3031    continue-on-error: false         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.3233    strategy:34      matrix:35        include:36          - network: "Opal"37            features: "--features=opal-runtime"38          - network: "Quartz"39            features: "--features=quartz-runtime"40          - network: "Unique"41            features: "--features=unique-runtime"4243    steps:44      - name: Skip if pull request is in Draft45        # `if: github.event.pull_request.draft == true` should be kept here, at46        # the step level, rather than at the job level. The latter is not47        # recommended because when the PR is moved from "Draft" to "Ready to48        # review" the workflow will immediately be passing (since it was skipped),49        # even though it hasn't actually ran, since it takes a few seconds for50        # the workflow to start. This is also disclosed in:51        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1752        # That scenario would open an opportunity for the check to be bypassed:53        # 1. Get your PR approved54        # 2. Move it to Draft55        # 3. Push whatever commits you want56        # 4. Move it to "Ready for review"; now the workflow is passing (it was57        #    skipped) and "Check reviews" is also passing (it won't be updated58        #    until the workflow is finished)59        if: github.event.pull_request.draft == true60        run: exit 16162      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it63      - uses: actions/checkout@v364        with:65          ref: ${{ github.event.pull_request.head.sha }}  #Checking out head commit6667      - name: Generate ENV related extend file for docker-compose68        uses: cuchi/jinja2-action@v1.2.069        with:70          template: .docker/docker-compose.tmp.j271          output_file: .docker/docker-compose.${{ matrix.network }}.yml72          variables: |73            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git74            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}75            POLKA_VERSION=${{ env.POLKA_VERSION }}76            FEATURE=${{ matrix.features }}77            BRANCH=${{ github.head_ref }}7879      - name: Show build configuration80        run: cat .docker/docker-compose.${{ matrix.network }}.yml8182      - name: Build the stack83        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build8485      - uses: actions/setup-node@v386        with:87          node-version: 168889      - name: Run tests90        run: |91          cd tests92          yarn install93          yarn add mochawesome94          yarn --pure-lockfile95          echo "Ready to start tests"96          node scripts/readyness.js97          NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}98        env:99          RPC_URL: http://127.0.0.1:9933/100101      - name: Test Report102        uses: phoenix-actions/test-reporting@v8103        if: success() || failure()    # run this step even if previous step failed104        with:105          name: Tests ${{ matrix.network }}            # Name of the check run which will be created106          path: tests/mochawesome-report/test-*.json    # Path to test results107          reporter: mochawesome-json108          fail-on-error: 'false'109110      - name: Read output variables111        run: |112          echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"113114      - name: Stop running containers115        if: always()                   # run this step always116        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
after · .github/workflows/node_build_test.yml
1name: Develop - Build & test23# 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      - develop9    types:10      - opened11      - reopened12      - synchronize   #commit(s) pushed to the pull request1314  # Allows you to run this workflow manually from the Actions tab15  workflow_dispatch:1617#Define Workflow variables18env:19  RUST_TOOLCHAIN: nightly-2022-05-1120  REPO_URL: ${{ github.server_url }}/${{ github.repository }}21  POLKA_VERSION: release-v0.9.242223# A workflow run is made up of one or more jobs that can run sequentially or in parallel24jobs:25  build:26    # The type of runner that the job will run on27    runs-on: self-hosted-ci2829    name: Build Container, Spin it Up an test3031    continue-on-error: false         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.3233    strategy:34      matrix:35        include:36          - network: "Opal"37            features: "--features=opal-runtime"38          - network: "Quartz"39            features: "--features=quartz-runtime"40          - network: "Unique"41            features: "--features=unique-runtime"4243    steps:44      - name: Skip if pull request is in Draft45        # `if: github.event.pull_request.draft == true` should be kept here, at46        # the step level, rather than at the job level. The latter is not47        # recommended because when the PR is moved from "Draft" to "Ready to48        # review" the workflow will immediately be passing (since it was skipped),49        # even though it hasn't actually ran, since it takes a few seconds for50        # the workflow to start. This is also disclosed in:51        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1752        # That scenario would open an opportunity for the check to be bypassed:53        # 1. Get your PR approved54        # 2. Move it to Draft55        # 3. Push whatever commits you want56        # 4. Move it to "Ready for review"; now the workflow is passing (it was57        #    skipped) and "Check reviews" is also passing (it won't be updated58        #    until the workflow is finished)59        if: github.event.pull_request.draft == true60        run: exit 16162      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it63      - uses: actions/checkout@v364        with:65          ref: ${{ github.event.pull_request.head.sha }}  #Checking out head commit6667      - name: Generate ENV related extend file for docker-compose68        uses: cuchi/jinja2-action@v1.2.069        with:70          template: .docker/docker-compose.tmp.j271          output_file: .docker/docker-compose.${{ matrix.network }}.yml72          variables: |73            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git74            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}75            POLKA_VERSION=${{ env.POLKA_VERSION }}76            FEATURE=${{ matrix.features }}77            BRANCH=${{ github.event.pull_request.head.sha }}7879      - name: Show build configuration80        run: cat .docker/docker-compose.${{ matrix.network }}.yml8182      - name: Build the stack83        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build8485      - uses: actions/setup-node@v386        with:87          node-version: 168889      - name: Run tests90        run: |91          cd tests92          yarn install93          yarn add mochawesome94          echo "Ready to start tests"95          node scripts/readyness.js96          NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}97        env:98          RPC_URL: http://127.0.0.1:9933/99100      - name: Test Report101        uses: phoenix-actions/test-reporting@v8102        if: success() || failure()    # run this step even if previous step failed103        with:104          name: Tests ${{ matrix.network }}            # Name of the check run which will be created105          path: tests/mochawesome-report/test-*.json    # Path to test results106          reporter: mochawesome-json107          fail-on-error: 'false'108109      - name: Read output variables110        run: |111          echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"112113      - name: Stop running containers114        if: always()                   # run this step always115        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
modified.github/workflows/tests_codestyle.ymldiffbeforeafterboth
--- a/.github/workflows/tests_codestyle.yml
+++ b/.github/workflows/tests_codestyle.yml
@@ -13,13 +13,31 @@
     runs-on: self-hosted-ci
 
     steps:
-    - uses: actions/checkout@v3
-    
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 16
+      - name: Skip if pull request is in Draft
+        # `if: github.event.pull_request.draft == true` should be kept here, at
+        # the step level, rather than at the job level. The latter is not
+        # recommended because when the PR is moved from "Draft" to "Ready to
+        # review" the workflow will immediately be passing (since it was skipped),
+        # even though it hasn't actually ran, since it takes a few seconds for
+        # the workflow to start. This is also disclosed in:
+        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
+        # That scenario would open an opportunity for the check to be bypassed:
+        # 1. Get your PR approved
+        # 2. Move it to Draft
+        # 3. Push whatever commits you want
+        # 4. Move it to "Ready for review"; now the workflow is passing (it was
+        #    skipped) and "Check reviews" is also passing (it won't be updated
+        #    until the workflow is finished)
+        if: github.event.pull_request.draft == true
+        run: exit 1
+
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
 
-    - name: Install modules
-      run: cd tests && yarn
-    - name: Run ESLint
-      run: cd tests && yarn eslint --ext .ts,.js src/
+      - name: Install modules
+        run: cd tests && yarn
+      - name: Run ESLint
+        run: cd tests && yarn eslint --ext .ts,.js src/
modifiedtests/scripts/readyness.jsdiffbeforeafterboth
--- a/tests/scripts/readyness.js
+++ b/tests/scripts/readyness.js
@@ -24,7 +24,7 @@
       break;
     }
     catch(e) {
-      await sleep(60000);
+      await sleep(10000);
     }
   }
 }