Skip to content

Commit

Permalink
Merge branch 'master' into pioneer-release-0.0.21
Browse files Browse the repository at this point in the history
  • Loading branch information
justinphamnz authored Jan 19, 2025
2 parents 4340087 + 4e31f4d commit b4bcc88
Show file tree
Hide file tree
Showing 196 changed files with 16,249 additions and 8,203 deletions.
41 changes: 40 additions & 1 deletion .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,43 @@ jobs:
build-args: |
GIT_COMMIT=${{ env.GIT_VERSION }}
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
run: echo ${{ steps.docker_build.outputs.digest }}
continuum:
runs-on: ubuntu-latest
environment:
name: continuum

if: ${{ github.event.inputs.runtime == 'continuum' }}
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Login to Container Registry
uses: docker/login-action@v1
with:
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }}

- name: Set branch name as env variable
run: |
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
gitversion=$(git rev-parse --short HEAD)
echo "running on $gitversion"
echo "GIT_VERSION=$gitversion" >> $GITHUB_ENV
shell: bash

- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
push: true
file: "scripts/${{ secrets.DOCKERFILE }}"
tags: |
${{ env.REGISTRY }}/${{ secrets.REGISTRY_ENDPOINT }}:latest
${{ env.REGISTRY }}/${{ secrets.REGISTRY_ENDPOINT }}:${{ env.GIT_VERSION }}
build-args: |
GIT_COMMIT=${{ env.GIT_VERSION }}
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
5 changes: 3 additions & 2 deletions .github/workflows/build-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Publish Release
# - Build WASM using Substrate Runtime Tool

env:
SUBWASM_VERSION: 0.17.0
SUBWASM_VERSION: 0.20.0

on:
workflow_dispatch:
Expand All @@ -19,6 +19,7 @@ on:
options:
- metaverse
- pioneer
- continuum
# Get the SR Tool image used to build
srtool_image:
description: Default to use the latest. You can use an alternate image, use with caution!
Expand All @@ -36,7 +37,7 @@ jobs:
# Build WASM with Substrate Runtime Tool
- name: Srtool build
id: srtool_build
uses: chevdor/srtool-actions@v0.4.0
uses: chevdor/srtool-actions@v0.7.0
with:
chain: ${{ github.event.inputs.chain }}
tag: ${{ github.event.inputs.srtool_image }}
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/rust-benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
check:
# The type of runner that the job will run on
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand All @@ -25,20 +25,16 @@ jobs:
- name: Set-Up
run: sudo apt install -y protobuf-compiler cmake pkg-config libssl-dev git build-essential clang libclang-dev curl

- name: Install Rustup
run: |
curl https://sh.rustup.rs -sSf | sh -s -- -y
source ~/.cargo/env
rustup default nightly && rustup update
rustup default nightly-2022-11-15
rustup target add wasm32-unknown-unknown --toolchain nightly-2022-11-15
- name: Check Rust version
- name: Install Rust version specified in rust-toolchain.toml
run: rustup show

- name: Check Format
run: cargo fmt --all -- --check

- name: Build Benchmarking
run: |
cargo build --release --features runtime-benchmarks
- name: Run Benchmarking
run: |
./target/release/metaverse-node benchmark pallet \
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/rust-build-benchmarking.yml

This file was deleted.

15 changes: 5 additions & 10 deletions .github/workflows/rust-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,12 @@ jobs:
- name: Set-Up
run: sudo apt install -y protobuf-compiler cmake pkg-config libssl-dev git build-essential clang libclang-dev curl

- name: Install Rustup
run: |
curl https://sh.rustup.rs -sSf | sh -s -- -y
source ~/.cargo/env
rustup default nightly && rustup update
rustup default nightly-2022-11-15
rustup target add wasm32-unknown-unknown --toolchain nightly-2022-11-15
- name: Check Rust version
run: rustup show
- name: Check Format
- name: Install Rust version specified in rust-toolchain.toml
run: rustup show

- name: Check Formatting
run: cargo fmt --all -- --check

- name: Check Build
run: |
SKIP_WASM_BUILD=1 cargo check --release --features with-pioneer-runtime,with-metaverse-runtime
14 changes: 4 additions & 10 deletions .github/workflows/rust-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,9 @@ jobs:
- name: Set-Up
run: sudo apt install -y protobuf-compiler cmake pkg-config libssl-dev git build-essential clang libclang-dev curl

- name: Install Rustup
run: |
curl https://sh.rustup.rs -sSf | sh -s -- -y
source ~/.cargo/env
rustup default nightly && rustup update
rustup default nightly-2022-11-15
rustup target add wasm32-unknown-unknown --toolchain nightly-2022-11-15
- name: Check Rust version
run: rustup show
- name: Install Rust version specified in rust-toolchain.toml
run: rustup show

- name: Run all test cases
run: |
SKIP_WASM_BUILD= cargo test --all --features with-pioneer-runtime
SKIP_WASM_BUILD= cargo test --all --features with-pioneer-runtime,with-precompile-tests
18 changes: 15 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
**/target/
# These are backup files generated by rustfmt
**/*.rs.bk

# Zombienet binaries
**/scripts/zombienet/bin/*
**/bin/*
.DS_Store

# The cache for docker container dependency
Expand All @@ -12,8 +14,18 @@
# The cache for chain data in container
.local

# chopsticks DB
db.sqlite
# These are copies chopsticks db files
**/scripts/chopsticks/db/*
**db*

# Node modules for EVM tools scripts
**/scripts/evm-tools/node_modules/
**/scripts/evm-tools/package-lock.json

# subalfred
subalfred
# subalfred logs
list

.vscode
*.code-workspace
Expand Down
Loading

0 comments on commit b4bcc88

Please sign in to comment.