Skip to content

Commit

Permalink
Merge branch 'main' into testnet
Browse files Browse the repository at this point in the history
  • Loading branch information
AurelienFT committed Feb 1, 2023
2 parents e4ec4cc + dd828cf commit 2931535
Show file tree
Hide file tree
Showing 204 changed files with 5,189 additions and 3,043 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
platform: arm64
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: "recursive"
- uses: actions-rs/toolchain@v1
Expand Down
47 changes: 42 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
sanity:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: "recursive"
- uses: actions-rs/toolchain@v1
Expand All @@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: "recursive"
- uses: actions-rs/toolchain@v1
Expand All @@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: "recursive"
- uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
- macOS-latest
- windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: "recursive"
- uses: actions-rs/toolchain@v1
Expand All @@ -124,10 +124,47 @@ jobs:
steps:
- run: exit 0

# Maybe launch it only in testnet branches
gas-costs-check:
if: github.ref != 'refs/heads/staging'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: "recursive"
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2022-12-24
components: rustfmt
override: true
- uses: actions/checkout@v3
with:
repository: massalabs/gas-calibration
path: gas-calibration
ref: main
- uses: actions/checkout@v3
with:
repository: massalabs/massa-as-sdk
path: massa-as-sdk
ref: main
# Replace the branch in the dependencies in gas-calibration project by the current branch
# Special case for massa-sc-runtime: we use the branch referenced in the Cargo.toml of massa-execution-worker.
- name: "Use the current branch as dependency for gas-calibration"
run: >
cd gas-calibration &&
sed -i 's!main!${{ github.head_ref || github.ref_name }}!g' Cargo.toml &&
sed -i 's!massa-sc-runtime = { git = "https://github.com/massalabs/massa-sc-runtime", features = \["gas_calibration"\] }!'"$(cat ../massa-execution-worker/Cargo.toml | grep 'massalabs/massa-sc-runtime' | sed 's!/!\\/!g' | sed 's!}!, features = ["gas_calibration"]}!g' )"'!g' Cargo.toml
- name: "Launch gas-calibration with one SC per ABI in massa-as-sdk to see if there is an ABI missing"
run: >
cd gas-calibration &&
cargo run -r -- --nb-scs-by-abi=1 --as-sdk-env-path=../massa-as-sdk/assembly/env/env.ts --only-generate

doc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: "recursive"
- uses: actions-rs/toolchain@v1
Expand Down
6 changes: 6 additions & 0 deletions .rusty-hook.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Generate git hooks run: cargo install rusty-hook && rusty-hook init
[hooks]
pre-commit= "cargo check && cargo fmt -- --check && cargo clippy -- -A clippy::uninlined-format-args"

[logging]
verbose = true
Loading

0 comments on commit 2931535

Please sign in to comment.