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

difftreelog

Clean up workflow. Add docker builder cleanup.

Alexander Aksenov2022-08-30parent: #6c48590.patch.diff
in: master

2 files changed

modified.docker/Dockerfile-parachain-node-onlydiffbeforeafterboth
before · .docker/Dockerfile-parachain-node-only
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21    rustup toolchain install $RUST_TOOLCHAIN && \22    rustup default $RUST_TOOLCHAIN && \23    rustup target list --installed && \24    rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2627RUN mkdir /unique_parachain28WORKDIR /unique_parachain2930# ===== BUILD current version ======31FROM rust-builder as builder-unique-current3233ARG PROFILE=release34ARG FEATURE=35ARG MAINNET_BRANCH=36ARG REPO_URL=3738WORKDIR /unique_parachain3940RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \41    cargo build --features=$FEATURE --$PROFILE4243# ===== BUILD target version ======44FROM rust-builder as builder-unique-target4546ARG PROFILE=release47ARG FEATURE=48ARG BRANCH=49ARG REPO_URL=5051COPY . /unique_parachain52WORKDIR /unique_parachain5354RUN cargo build --features=$FEATURE --$PROFILE5556# ===== BUILD POLKADOT =====57FROM rust-builder as builder-polkadot5859ARG POLKADOT_BUILD_BRANCH=60ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH616263WORKDIR /unique_parachain6465RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \66    cd polkadot && \67    cargo build --release6869# ===== RUN ======7071FROM ubuntu:20.047273ARG RUNTIME=74ENV RUNTIME $RUNTIME7576RUN apt-get -y update && \77    apt-get -y install curl git && \78    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \79    export NVM_DIR="$HOME/.nvm" && \80    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \81    nvm install v16.16.0 && \82    nvm use v16.16.08384RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing8586RUN export NVM_DIR="$HOME/.nvm" && \87    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \88    cd /polkadot-launch && \89    npm install --global yarn && \90    yarn install9192RUN echo "$RUNTIME"9394COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/95COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/96COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm9798COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/99COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm100101CMD export NVM_DIR="$HOME/.nvm" && \102    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \103    cd /polkadot-launch && \104    yarn start launch-config.json --test-upgrade-parachains -w -n
after · .docker/Dockerfile-parachain-node-only
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21    rustup toolchain install $RUST_TOOLCHAIN && \22    rustup default $RUST_TOOLCHAIN && \23    rustup target list --installed && \24    rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2627RUN mkdir /unique_parachain28WORKDIR /unique_parachain293031# ===== BUILD current version ======32FROM rust-builder as builder-unique-current3334ARG PROFILE=release35ARG FEATURE=36ARG MAINNET_BRANCH=37ARG REPO_URL=3839WORKDIR /unique_parachain4041RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \42    cargo build --features=$FEATURE --$PROFILE4344# ===== BUILD target version ======45FROM rust-builder as builder-unique-target4647ARG PROFILE=release48ARG FEATURE=4950COPY . /unique_parachain51WORKDIR /unique_parachain5253RUN cargo build --features=$FEATURE --$PROFILE5455# ===== BUILD POLKADOT =====56FROM rust-builder as builder-polkadot5758ARG POLKADOT_BUILD_BRANCH=59ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH606162WORKDIR /unique_parachain6364RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \65    cd polkadot && \66    cargo build --release6768# ===== RUN ======6970FROM ubuntu:20.047172ARG RUNTIME=73ENV RUNTIME $RUNTIME7475RUN apt-get -y update && \76    apt-get -y install curl git && \77    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \78    export NVM_DIR="$HOME/.nvm" && \79    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \80    nvm install v16.16.0 && \81    nvm use v16.16.08283RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing8485RUN export NVM_DIR="$HOME/.nvm" && \86    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \87    cd /polkadot-launch && \88    npm install --global yarn && \89    yarn install9091RUN echo "$RUNTIME"9293COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/94COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/95COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm9697COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/98COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm99100CMD export NVM_DIR="$HOME/.nvm" && \101    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \102    cd /polkadot-launch && \103    yarn start launch-config.json --test-upgrade-parachains -w -n
modified.github/workflows/nodes-only-update.ymldiffbeforeafterboth
--- a/.github/workflows/nodes-only-update.yml
+++ b/.github/workflows/nodes-only-update.yml
@@ -142,7 +142,7 @@
           node-version: 16
 
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300
+        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate --timeout 300
 
       #  🚀 POLKADOT LAUNCH COMPLETE 🚀
       - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.
@@ -191,8 +191,8 @@
         shell: bash
 
       - name: Run tests before Node Parachain upgrade
+        working-directory: tests
         run: |
-          cd tests
           yarn install
           yarn add mochawesome
           echo "Ready to start tests"
@@ -211,7 +211,7 @@
           fail-on-error: 'false'
 
       - name: Send SIGUSR1 to polkadotlaunch process
-        if: success()
+        if: success() || failure()
         run: |
           #Get PID of polkadot-launch
           PID=$(docker exec node-parachain pidof 'polkadot-launch')
@@ -266,8 +266,8 @@
         shell: bash
 
       - name: Run tests after Node Parachain upgrade
+        working-directory: tests
         run: |
-          cd tests
           yarn install
           yarn add mochawesome
           echo "Ready to start tests"
@@ -288,9 +288,14 @@
 
       - name: Stop running containers
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down
+        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" down --volumes
 
-        #docker-compose rm -f
-      - name: Remove Docker build artefacts
+      - name: Remove builder cache
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-forkless.yml" -f ".docker/docker-compose.node.${{ matrix.network }}.yml" rm -f
+        run: |
+          docker builder prune -f
+          docker system prune -f
+
+      - name: Clean Workspace
+        if: always()
+        uses: AutoModality/action-clean@v1.1.0