git.delta.rocks / unique-network / refs/commits / 50fb43d1067e

difftreelog

Merge pull request #461 from lzadjsf/ci-build-workflow-v3

kozyrevdev2022-08-05parents: #b7c1009 #9f15e9c.patch.diff
in: master
CI, step 1

12 files changed

added.docker/Dockerfile-chain-devdiffbeforeafterboth
--- /dev/null
+++ b/.docker/Dockerfile-chain-dev
@@ -0,0 +1,29 @@
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV TZ=Etc/UTC
+
+RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake
+
+ENV CARGO_HOME="/cargo-home"
+ENV PATH="/cargo-home/bin:$PATH"
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
+
+ARG RUST_TOOLCHAIN=nightly-2022-05-11
+ARG POLKA_VERSION=release-v0.9.24
+ARG BRANCH=
+ARG REPO_URL=
+ARG FEATURE=
+
+RUN rustup toolchain uninstall $(rustup toolchain list) && \
+    rustup toolchain install $RUST_TOOLCHAIN && \
+    rustup default $RUST_TOOLCHAIN && \
+    rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
+
+RUN mkdir /dev_chain && git clone $REPO_URL -b $BRANCH /dev_chain
+WORKDIR /dev_chain
+
+RUN cargo build --release
+
+CMD cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
added.docker/Dockerfile-parachaindiffbeforeafterboth
--- /dev/null
+++ b/.docker/Dockerfile-parachain
@@ -0,0 +1,84 @@
+# ===== Rust builder =====
+FROM ubuntu:20.04 as rust-builder
+LABEL maintainer="Unique.Network"
+
+ARG RUST_TOOLCHAIN=nightly-2022-05-11
+
+ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
+ENV CARGO_HOME="/cargo-home"
+ENV PATH="/cargo-home/bin:$PATH"
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
+
+RUN apt-get update && \
+    apt-get install -y cmake pkg-config libssl-dev git clang && \
+    apt-get clean && \
+    rm -r /var/lib/apt/lists/*
+
+RUN rustup toolchain uninstall $(rustup toolchain list) && \
+    rustup toolchain install $RUST_TOOLCHAIN && \
+    rustup default $RUST_TOOLCHAIN && \
+    rustup target list --installed && \
+    rustup show
+RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
+
+
+RUN mkdir /unique_parachain
+WORKDIR /unique_parachain
+
+# ===== BUILD ======
+FROM rust-builder as builder-unique
+
+ARG PROFILE=release
+ARG FEATURE=
+
+RUN mkdir /unique_parachain
+WORKDIR /unique_parachain
+
+RUN git clone $REPO_URL -b $BRANCH
+RUN cargo build $FEATURE --$PROFILE
+
+# ===== BUILD POLKADOT =====
+FROM rust-builder as builder-polkadot
+
+ARG POLKA_VERSION=release-v0.9.24
+ENV POLKA_VERSION $POLKA_VERSION
+
+RUN mkdir /unique_parachain
+WORKDIR /unique_parachain
+
+RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
+    cd polkadot && \
+    cargo build --release
+
+# ===== RUN ======
+
+FROM ubuntu:20.04
+
+RUN apt-get -y update && \
+      apt-get -y upgrade && \
+      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
+
+RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing
+
+RUN export NVM_DIR="$HOME/.nvm" && \
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+    cd /polkadot-launch && \
+    npm install --global yarn && \
+    yarn install
+
+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 --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json
+
+
+CMD export NVM_DIR="$HOME/.nvm" && \
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+    cd /polkadot-launch && \
+    yarn start launch-config.json
added.docker/docker-compose-dev.yamldiffbeforeafterboth
--- /dev/null
+++ b/.docker/docker-compose-dev.yaml
@@ -0,0 +1,19 @@
+version: "3.5"
+
+services:
+  node-dev:
+    build:
+      context: ../
+      dockerfile: .docker/Dockerfile-chain-dev
+    image: node-dev
+    container_name: node-dev
+    expose:
+      - 9944
+      - 9933
+    ports:
+      - 127.0.0.1:9944:9944
+      - 127.0.0.1:9933:9933
+    logging:
+      options:
+        max-size: "1m"
+        max-file: "3"
added.docker/docker-compose.tmp.j2diffbeforeafterboth
--- /dev/null
+++ b/.docker/docker-compose.tmp.j2
@@ -0,0 +1,13 @@
+version: "3.5"
+
+services:
+  node-dev:
+    build:
+      args:
+        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
+        - "BRANCH={{ BRANCH }}"
+        - "REPO_URL={{ REPO_URL }}"
+        - "FEATURE={{ FEATURE }}"
+        - "POLKA_VERSION={{ POLKA_VERSION }}"
+
+    command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
modified.dockerignorediffbeforeafterboth
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,6 @@
 .git/
 .github/
+.docker/
 doc/
 target/
 tests/
modified.github/workflows/codestyle.ymldiffbeforeafterboth
--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@ -1,12 +1,37 @@
 name: Code style
 
-on: [push]
+on:
+  pull_request:
+    branches:
+      - develop
+    types:
+      - opened
+      - reopened
+      - synchronize
 
 jobs:
   rustfmt:
-    runs-on: ubuntu-20.04
+    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
@@ -20,10 +45,28 @@
 
   clippy:
     if: ${{ false }}
-    runs-on: ubuntu-20.04
+    runs-on: self-hosted-ci
 
     steps:
-      - uses: actions/checkout@v1
+      - 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
       - name: Install latest nightly
modified.github/workflows/node_build_test.ymldiffbeforeafterboth
1name: Build & test1name: Develop - Build & test
22
3# Controls when the action will run. 3# Controls when the action will run.
4on:4on:
5 # Triggers the workflow on push or pull request events but only for the master branch5 # Triggers the workflow on push or pull request events but only for the master branch
6  push:6  pull_request:
7    branches: [ develop ]7    branches:
8 # pull_request:8      - develop
9 #   branches: [ develop ]9    types:
10      - opened
11      - reopened
12      - synchronize   #commit(s) pushed to the pull request
13
10  # Allows you to run this workflow manually from the Actions tab14  # Allows you to run this workflow manually from the Actions tab
11  workflow_dispatch:15  workflow_dispatch:
1216
13# A workflow run is made up of one or more jobs that can run sequentially or in parallel17#Define Workflow variables
18env:
19  RUST_TOOLCHAIN: nightly-2022-05-11
20  REPO_URL: ${{ github.server_url }}/${{ github.repository }}
21  POLKA_VERSION: release-v0.9.24
22
23# A workflow run is made up of one or more jobs that can run sequentially or in parallel
14jobs:24jobs:
15  build:25  build:
16    # The type of runner that the job will run on26    # The type of runner that the job will run on
17    runs-on: ubuntu-20.0427    runs-on: self-hosted-ci
1828
19  #  if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true29    name: Build Container, Spin it Up an test
2030
21    # Steps represent a sequence of tasks that will be executed as part of the job31    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.
32
33    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"
42
22    steps:43    steps:
44      - name: Skip if pull request is in Draft
45        # `if: github.event.pull_request.draft == true` should be kept here, at
46        # the step level, rather than at the job level. The latter is not
47        # recommended because when the PR is moved from "Draft" to "Ready to
48        # 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 for
50        # the workflow to start. This is also disclosed in:
51        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
52        # That scenario would open an opportunity for the check to be bypassed:
53        # 1. Get your PR approved
54        # 2. Move it to Draft
55        # 3. Push whatever commits you want
56        # 4. Move it to "Ready for review"; now the workflow is passing (it was
57        #    skipped) and "Check reviews" is also passing (it won't be updated
58        #    until the workflow is finished)
59        if: github.event.pull_request.draft == true
60        run: exit 1
61
23      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it62      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
24      - uses: actions/checkout@v263      - uses: actions/checkout@v3
25          64        with:
26     #runs ssh connection65          ref: ${{ github.head_ref }}  #Checking out head commit
66
67      - name: Generate ENV related extend file for docker-compose
68        uses: cuchi/jinja2-action@v1.2.0
69        with:
70          template: .docker/docker-compose.tmp.j2
71          output_file: .docker/docker-compose.${{ matrix.network }}.yml
72          variables: |
73            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
74            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
75            POLKA_VERSION=${{ env.POLKA_VERSION }}
76            FEATURE='${{ matrix.features }}'
77            BRANCH=${{ github.head_ref }}
78
79      - name: Show build configuration
80        run: cat .docker/docker-compose.${{ matrix.network }}.yml
81
82      - name: Build the stack
83        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build
84
85      - uses: actions/setup-node@v3
86        with:
87          node-version: 16
88
89      - name: Run tests
90        run: |
91          cd tests
92          yarn install
93          yarn add mochawesome
94          echo "Ready to start tests"
95          node scripts/readyness.js
96          NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
97        env:
98          RPC_URL: http://127.0.0.1:9933/
99
27      - name: Go to server100      - name: Test Report
28        uses: appleboy/ssh-action@master101        uses: phoenix-actions/test-reporting@v8
102        if: success() || failure()    # run this step even if previous step failed
29        with:103        with:
30          host: ${{ secrets.SERVER_IP }}
31          username: ${{ secrets.SERVER_USERNAME }}104          name: Tests ${{ matrix.network }}            # Name of the check run which will be created
32          key: ${{ secrets.KEY }}105          path: tests/mochawesome-report/test-*.json    # Path to test results
33          port: ${{ secrets.SERVER_PORT }}106          reporter: mochawesome-json
34          command_timeout: 300m
35          script: |107          fail-on-error: 'false'
36            eval $(ssh-agent -s)108
37            ssh-add /home/devops/.ssh/git_hub109      - name: Read output variables
38            git clone git@github.com:UniqueNetwork/unique-chain.git110        run: |
39            cd unique-chain111          echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"
40            git checkout develop112
41            # git pull --all113      - name: Stop running containers
42            chmod +x ci_node.sh114        if: always()                   # run this step always
43            ./ci_node.sh115        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
44            rm -rf /home/polkadot/unique-chain
45116
deleted.github/workflows/notify.ymldiffbeforeafterboth
--- a/.github/workflows/notify.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: telegram message
-on:
-  push:
-    branches: [ develop ]  
-jobs:
-  build:    
-    runs-on: ubuntu-latest    
-    steps:        
-    - uses: avkviring/telegram-github-action@v0.0.13
-      env:
-        telegram_to: ${{ secrets.TELEGRAM_TO }}  
-        telegram_token: ${{ secrets.TELEGRAM_TOKEN }}
-        event: ${{ toJson(github.event) }}
modified.github/workflows/tests_codestyle.ymldiffbeforeafterboth
--- a/.github/workflows/tests_codestyle.yml
+++ b/.github/workflows/tests_codestyle.yml
@@ -1,14 +1,43 @@
 name: Tests code style
 
-on: [push]
-
+on:
+  pull_request:
+    branches:
+      - develop
+    types:
+      - opened
+      - reopened
+      - synchronize
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: self-hosted-ci
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Install modules
-      run: cd tests && yarn
-    - name: Run ESLint
-      run: cd tests && yarn eslint --ext .ts,.js src/
\ No newline at end of file
+      - 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/
deletedDockerfile-parachaindiffbeforeafterboth
--- a/Dockerfile-parachain
+++ /dev/null
@@ -1,107 +0,0 @@
-# ===== Rust builder =====
-FROM phusion/baseimage:focal-1.1.0 as rust-builder
-LABEL maintainer="Unique.Network"
-
-ARG RUST_TOOLCHAIN=nightly-2022-05-11
-#ARG RUST_C=1.62.0-nightly
-ARG POLKA_VERSION=release-v0.9.24
-ARG UNIQUE_BRANCH=develop
-
-#ARG USER=***
-#ARG PASS=***
-
-
-ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
-#ENV RUST_C $RUST_C
-ENV POLKA_VERSION $POLKA_VERSION
-ENV UNIQUE_BRANCH $UNIQUE_BRANCH
-
-
-#RUN echo $RUST_TOOLCHAIN
-#RUN echo $RUST_C
-#RUN echo $POLKA_VERSION
-#RUN echo $UNIQUE_BRANCH
-
-ENV CARGO_HOME="/cargo-home"
-ENV PATH="/cargo-home/bin:$PATH"
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
-RUN apt-get update && \
-    apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
-    apt-get install -y cmake pkg-config libssl-dev git clang
-
-RUN rustup toolchain uninstall $(rustup toolchain list) && \
-    rustup toolchain install $RUST_TOOLCHAIN && \
-    rustup default $RUST_TOOLCHAIN && \
-    rustup target list --installed && \
-    rustup show
-RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
-
-RUN cargo install cargo-chef
-
-RUN mkdir unique_parachain
-WORKDIR /unique_parachain
-
-# ===== Chef =====
-FROM rust-builder as chef
-
-COPY . .
-RUN cargo chef prepare --recipe-path recipe.json
-
-# ===== BUILD ======
-FROM rust-builder as builder
-
-RUN mkdir unique_parachain
-WORKDIR /unique_parachain
-
-COPY --from=chef /unique_parachain/recipe.json recipe.json
-ARG PROFILE=release
-RUN cargo chef cook "--$PROFILE" --recipe-path recipe.json
-
-COPY . .
-RUN cargo build "--$PROFILE"
-   # && \
-   # cargo test
-
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-RUN mkdir unique_parachain
-WORKDIR /unique_parachain
-
-RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
-    cd polkadot && \
-    git tag -n && \
-	cargo build --release
-
-# ===== RUN ======
-
-FROM phusion/baseimage:focal-1.1.0
-
-ARG PROFILE=release
-
-RUN apt-get -y update && \
-      apt-get -y upgrade && \
-      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 v15.5.0 && \
-      nvm use v15.5.0
-
-RUN git clone https://github.com/paritytech/polkadot-launch
-
-RUN export NVM_DIR="$HOME/.nvm" && \
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
-    npm install --global yarn && \
-    yarn
-
-COPY --from=builder /unique_parachain/target/$PROFILE/unique-collator /unique-chain/target/$PROFILE/
-COPY --from=builder-polkadot /unique_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/
-
-CMD export NVM_DIR="$HOME/.nvm" && \
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
-    yarn start launch-config.json
deleteddocker-compose-tests-parachain.ymldiffbeforeafterboth
--- a/docker-compose-tests-parachain.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-version: "3.5"
-
-services:
-  blockchain_nodes:
-    build:
-      context: ./
-      dockerfile: Dockerfile-parachain
-      args:
-        - RUST_TOOLCHAIN=${RUST_TOOLCHAIN:?err}
-        - RUST_C=${RUST_C:?err}
-        - POLKA_VERSION=${POLKA_VERSION:?err}
-        - UNIQUE_BRANCH=${UNIQUE_BRANCH:?err}
-    volumes:
-      - ./launch-config.json:/polkadot-launch/launch-config.json
-    env_file:
-      - ./.env
-
-  integration_tests:
-    build:
-      context: tests/
-      dockerfile: Dockerfile-tests
-    environment:
-      RPC_URL: http://blockchain_nodes:9933/
-    volumes:
-      - ./tests/src/config_docker.ts:/unique_parachain/src/config.ts
-      - /home/ubuntu/mochawesome-report:/unique_parachain/mochawesome-report
-    depends_on:
-      - blockchain_nodes
addedtests/scripts/readyness.jsdiffbeforeafterboth
--- /dev/null
+++ b/tests/scripts/readyness.js
@@ -0,0 +1,35 @@
+const { ApiPromise, WsProvider } = require('@polkadot/api');
+
+const connect = async () => {
+  const wsEndpoint = 'ws://127.0.0.1:9944'
+  const api = new ApiPromise({provider: new WsProvider(wsEndpoint)});
+  await api.isReadyOrError;
+
+  const head = (await api.rpc.chain.getHeader()).number.toNumber();
+  if(head < 1) throw Error('No block #1');
+
+  await api.disconnect();
+}
+
+const sleep = time => {
+    return new Promise(resolve => {
+        setTimeout(() => resolve(), time);
+    });
+}
+
+const main = async () => {
+  while(true) {
+    try {
+      await connect();
+      break;
+    }
+    catch(e) {
+      await sleep(10000);
+    }
+  }
+}
+
+main().then(() => process.exit(0)).catch(e => {
+  console.error(e);
+  process.exit(1);
+});