git.delta.rocks / unique-network / refs/commits / 155033b72fcf

difftreelog

fix path for astar parachain

Konstantin Astakhov2023-03-27parent: #39f27b5.patch.diff
in: master

4 files changed

modified.docker/Dockerfile-acala.j2diffbeforeafterboth
--- a/.docker/Dockerfile-acala.j2
+++ b/.docker/Dockerfile-acala.j2
@@ -38,4 +38,4 @@
 
 FROM ubuntu:22.04 as builder-acala
 
-COPY --from=builder-acala-bin /unique_parachain/Acala/target/production/acala /unique_parachain/Acala/target/production/acala
+COPY --from=builder-acala-bin /unique_parachain/Acala/target/production/acala /unique_parachain/acala/target/production/acala
modified.docker/Dockerfile-astar.j2diffbeforeafterboth
--- a/.docker/Dockerfile-astar.j2
+++ b/.docker/Dockerfile-astar.j2
@@ -37,4 +37,4 @@
 
 FROM ubuntu:20.04 as builder-astar
 
-COPY --from=builder-astar-bin /unique_parachain/Astar/target/release/astar /unique_parachain/Astar/target/release/astar
+COPY --from=builder-astar-bin /unique_parachain/Astar/target/release/astar-collator /unique_parachain/astar/target/release/astar
modified.docker/Dockerfile-xcm.j2diffbeforeafterboth
before · .docker/Dockerfile-xcm.j2
1# ===== Rust builder =====2FROM uniquenetwork/services:latest as rust-builder3ENV CARGO_HOME="/cargo-home"4ENV PATH="/cargo-home/bin:$PATH"5ENV TZ=UTC67RUN rustup toolchain uninstall $(rustup toolchain list) && \8    rustup toolchain install {{ RUST_TOOLCHAIN }} && \9    rustup default {{ RUST_TOOLCHAIN }} && \10    rustup target list --installed && \11    rustup show12RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}1314RUN mkdir /unique_parachain15WORKDIR /unique_parachain1617# ===== BUILD ======18FROM rust-builder as builder-unique1920ARG PROFILE=release2122WORKDIR /unique_parachain2324COPY ./xcm-config/launch-config-xcm-{{ NETWORK }}.json ./launch-config-xcm-{{ NETWORK }}.json25COPY ./xcm-config/5validators.jsonnet ./5validators.jsonnet2627RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \28    cd unique-chain && \29    cargo build --features={{ NETWORK }}-runtime --$PROFILE3031# ===== RUN ======3233FROM ubuntu:22.043435RUN apt-get -y update && \36      apt-get -y install curl git && \37      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \38      export NVM_DIR="$HOME/.nvm" && \39      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \40      nvm install v16.16.0 && \41      nvm use v16.16.04243RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}4445RUN export NVM_DIR="$HOME/.nvm" && \46    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \47    cd /polkadot-launch && \48    npm install --global yarn && \49    yarn install5051COPY --from=builder-unique /unique_parachain/launch-config-xcm-{{ NETWORK }}.json /polkadot-launch/52COPY --from=builder-unique /unique_parachain/5validators.jsonnet /polkadot-launch/5validators.jsonnet5354COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/5556COPY --from=uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/57COPY --from=uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/58COPY --from=uniquenetwork/builder-cumulus:{{ CUMULUS_BUILD_BRANCH }} /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus59COPY --from=uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} /unique_parachain/Acala/target/production/acala /acala/target/release/60COPY --from=uniquenetwork/builder-astar:{{ ASTAR_BUILD_BRANCH }} /unique_parachain/Astar/target/release/astar /astar/target/release/61COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/6263EXPOSE 984464EXPOSE 993365EXPOSE 994466EXPOSE 994667EXPOSE 994768EXPOSE 994869EXPOSE 99497071CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \72    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \73    cd /polkadot-launch && \74    yarn start launch-config-xcm-{{ NETWORK }}.json
modified.github/workflows/xcm.ymldiffbeforeafterboth
--- a/.github/workflows/xcm.yml
+++ b/.github/workflows/xcm.yml
@@ -18,7 +18,7 @@
 
     name: Prepare execution matrix
 
-    runs-on: [XL]
+    runs-on: [self-hosted-ci]
     outputs:
       matrix: ${{ steps.create_matrix.outputs.matrix }}
 
@@ -228,7 +228,7 @@
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             ASTAR_BUILD_BRANCH=${{ matrix.astar_version }}
 
-      - name: Check if the dockerhub repository contains the needed MOONBEAM version
+      - name: Check if the dockerhub repository contains the needed ASTAR version
         run: |
           # aquire token
             TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)