Skip to content

Commit 72b256e

Browse files
andrei-marinicaandrei-marinica
committed
Merge branch 'master' into crowdfunding-refactor
2 parents ee1e924 + 473a955 commit 72b256e

File tree

404 files changed

+1994
-1698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

404 files changed

+1994
-1698
lines changed

‎.github/workflows/actions.yml‎

Lines changed: 88 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,107 @@ permissions:
1212
pull-requests: write
1313

1414
jobs:
15-
contracts:
16-
name: Contracts
17-
uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v5.0.0
15+
rust-tests-min:
16+
name: Rust Tests (rustc 1.85)
17+
uses: multiversx/mx-sc-actions/.github/workflows/rust-tests.yml@v6.0.0
18+
with:
19+
rust-toolchain: 1.85
20+
runs-on: ubuntu-latest
21+
22+
rust-tests-max:
23+
name: Rust Tests (rustc 1.92)
24+
uses: multiversx/mx-sc-actions/.github/workflows/rust-tests.yml@v6.0.0
25+
with:
26+
rust-toolchain: 1.92
27+
runs-on: ubuntu-latest
28+
29+
setup:
30+
name: Setup Environment
31+
uses: multiversx/mx-sc-actions/.github/workflows/setup.yml@v6.0.0
1832
with:
1933
rust-toolchain: 1.87
20-
wasm-opt-version: 125
21-
setup-runs-on: ubuntu-latest
22-
test-coverage-runs-on: ubuntu-latest
34+
runs-on: ubuntu-latest
2335
rust-target: wasm32v1-none
2436
path-to-sc-meta: framework/meta
2537
mx-scenario-go-version: v5.1.0
26-
enable-interactor-tests: true
27-
coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md
28-
secrets:
29-
token: ${{ secrets.GITHUB_TOKEN }}
38+
wasm-opt-version: 125
39+
40+
build-contracts:
41+
name: Build Contracts
42+
needs: setup
43+
uses: multiversx/mx-sc-actions/.github/workflows/build-contracts.yml@v6.0.0
44+
with:
45+
rust-toolchain: 1.87
46+
runs-on: ubuntu-latest
47+
rust-target: wasm32v1-none
48+
49+
wasm-tests:
50+
name: Wasm Tests
51+
needs: build-contracts
52+
uses: multiversx/mx-sc-actions/.github/workflows/wasm-tests.yml@v6.0.0
53+
with:
54+
rust-toolchain: 1.87
55+
runs-on: ubuntu-latest
56+
57+
interactor-tests:
58+
name: Interactor Tests
59+
needs: build-contracts
60+
uses: multiversx/mx-sc-actions/.github/workflows/interactor-tests.yml@v6.0.0
61+
with:
62+
rust-toolchain: 1.87
63+
runs-on: ubuntu-latest
64+
65+
generate-report:
66+
name: Generate Report
67+
needs: build-contracts
68+
uses: multiversx/mx-sc-actions/.github/workflows/report.yml@v6.0.0
69+
with:
70+
rust-toolchain: 1.87
71+
runs-on: ubuntu-latest
72+
73+
test-coverage:
74+
name: Test Coverage
75+
if: false # Temporarily disabled
76+
needs: setup
77+
uses: multiversx/mx-sc-actions/.github/workflows/coverage.yml@v6.0.0
78+
with:
79+
rust-toolchain: 1.87
80+
runs-on: ubuntu-latest
81+
coverage-args: "--ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md"
82+
83+
proxy-compare:
84+
name: Proxy Compare
85+
needs: setup
86+
uses: multiversx/mx-sc-actions/.github/workflows/proxy-compare.yml@v6.0.0
87+
with:
88+
rust-toolchain: 1.87
89+
runs-on: ubuntu-latest
90+
91+
clippy-check:
92+
name: Clippy linter check
93+
runs-on: ubuntu-latest
94+
steps:
95+
- uses: actions/checkout@v5
96+
- uses: actions-rust-lang/setup-rust-toolchain@v1
97+
with:
98+
toolchain: 1.87
99+
components: clippy
100+
- uses: giraffate/clippy-action@v1
101+
env:
102+
RUSTFLAGS: ""
103+
with:
104+
github_token: ${{ secrets.GITHUB_TOKEN }}
105+
clippy_flags: "--all-targets --all-features"
30106

31107
formatting:
32108
name: cargo fmt
33109
runs-on: ubuntu-latest
34110
steps:
35-
- uses: actions/checkout@v4
111+
- uses: actions/checkout@v5
36112
# Ensure rustfmt is installed and setup problem matcher
37113
- uses: actions-rust-lang/setup-rust-toolchain@v1
38114
with:
39115
components: rustfmt
40116
- name: Rustfmt Check
41117
uses: actions-rust-lang/rustfmt@v1
118+

‎.github/workflows/gas-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v5
2020

2121
- name: Install rust
2222
uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434
steps:
3535
- name: Checkout code
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v5
3737

3838
- name: Install rust
3939
uses: actions-rust-lang/setup-rust-toolchain@v1

‎.github/workflows/lldb-formatter-tests.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: LLDB
22

33
on:
44
push:
@@ -12,10 +12,12 @@ jobs:
1212
name: LLDB formatter tests
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: actions-rs/toolchain@v1
15+
- name: Checkout code
16+
uses: actions/checkout@v5
17+
18+
- name: Install rust
19+
uses: actions-rust-lang/setup-rust-toolchain@v1
1720
with:
18-
default: true
1921
toolchain: 1.87
2022

2123
- name: Download vscode-lldb
@@ -28,10 +30,12 @@ jobs:
2830
- name: Setup vscode-lldb
2931
run: |
3032
unzip codelldb-linux-x64.vsix -d vscode-lldb
31-
mkdir -p $HOME/.vscode/extensions/vadimcn.vscode-lldb
32-
mv vscode-lldb/extension/* $HOME/.vscode/extensions/vadimcn.vscode-lldb
33+
mkdir -p "$HOME"/.vscode/extensions/vadimcn.vscode-lldb
34+
mv vscode-lldb/extension/* "$HOME"/.vscode/extensions/vadimcn.vscode-lldb
3335
34-
- name: Run the rust tests
36+
- name: Test LLDB formatters
37+
env:
38+
CARGO_PROFILE_DEV_DEBUG: 2
3539
run: |
3640
cd tools/rust-debugger/format-tests
3741
cargo test

‎.github/workflows/plotter-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Plotter CI
22

33
on:
44
push:
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v5
2020

2121
- name: Install rust
2222
uses: actions-rust-lang/setup-rust-toolchain@v1

‎.github/workflows/proxy-compare.yml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.github/workflows/release-upload.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v5
1818

1919
- name: Install rust
2020
uses: actions-rust-lang/setup-rust-toolchain@v1

‎.github/workflows/template-test-current.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Templates CI
22

33
on:
44
push:
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v5
2020

2121
- name: Install rust
2222
uses: actions-rust-lang/setup-rust-toolchain@v1

‎.github/workflows/template-test-released.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Templates CI
22

33
on:
44
push:
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v5
2020

2121
- name: Install rust
2222
uses: actions-rust-lang/setup-rust-toolchain@v1

‎.github/workflows/typo-checker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout Actions Repository
10-
uses: actions/checkout@v2
10+
uses: actions/checkout@v5
1111
- name: Check spelling of the entire repository
1212
uses: crate-ci/typos@v1.34.0

‎.github/workflows/vm-bls-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: VM CI
22

33
on:
44
push:
@@ -12,11 +12,11 @@ permissions:
1212

1313
jobs:
1414
bls_test:
15-
name: Rust VM BLS test
15+
name: BLS test
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v5
2020

2121
- name: Install rust
2222
uses: actions-rust-lang/setup-rust-toolchain@v1

0 commit comments

Comments
 (0)