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
69 with:69 with:
70 template: .docker/docker-compose.tmp.j270 template: .docker/docker-compose.tmp.j2
71 output_file: .docker/docker-compose.${{ matrix.network }}.yml71 output_file: .docker/docker-compose.${{ matrix.network }}.yml
72 variables: |72 variables: |
73 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git73 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
74 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}74 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
75 POLKA_VERSION=${{ env.POLKA_VERSION }}75 POLKA_VERSION=${{ env.POLKA_VERSION }}
76 FEATURE=${{ matrix.features }}76 FEATURE=${{ matrix.features }}
77 BRANCH=${{ github.head_ref }}77 BRANCH=${{ github.event.pull_request.head.sha }}
7878
79 - name: Show build configuration79 - name: Show build configuration
80 run: cat .docker/docker-compose.${{ matrix.network }}.yml80 run: cat .docker/docker-compose.${{ matrix.network }}.yml
87 node-version: 1687 node-version: 16
8888
89 - name: Run tests89 - name: Run tests
90 run: |90 run: |
91 cd tests91 cd tests
92 yarn install92 yarn install
93 yarn add mochawesome93 yarn add mochawesome
94 yarn --pure-lockfile94 echo "Ready to start tests"
95 echo "Ready to start tests"95 node scripts/readyness.js
96 node scripts/readyness.js96 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
97 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
98 env:97 env:
99 RPC_URL: http://127.0.0.1:9933/98 RPC_URL: http://127.0.0.1:9933/
10099
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);
     }
   }
 }