Skip to content

Commit

Permalink
Update MAIN.2.4 (#4774)
Browse files Browse the repository at this point in the history
* Update massa-sc-runtime to include fix of as_abort

* Update Version and package to MAIN.2.4

* Update rust version to 1.81 (#4750)

* Update rust version to 1.81

* Cargo clippy & fmt pass

* Cargo clippy & fmt pass 2

* Cargo clippy & fmt pass 3

* Remove commented code

* Fix outdated UT

Signed-off-by: Jean-François <[email protected]>

* Fix new clippy warnings

---------

Signed-off-by: Jean-François <[email protected]>
Co-authored-by: Sydhds <[email protected]>
Co-authored-by: Jean-François <[email protected]>
  • Loading branch information
3 people authored Nov 22, 2024
1 parent 07b093c commit 1965bec
Show file tree
Hide file tree
Showing 95 changed files with 194 additions and 223 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.74.1
toolchain: 1.81.0
target: ${{ matrix.target }}
override: true
- uses: Swatinem/rust-cache@v2
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [main, staging, trying]
pull_request:
branches: [main, 'testnet_*']
branches: [main, 'mainnet_*']
types:
- opened
- reopened
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.74.1
toolchain: 1.81.0
components: rustfmt
override: true
- uses: Swatinem/rust-cache@v2
Expand All @@ -57,7 +57,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.74.1
toolchain: 1.81.0
- uses: Swatinem/rust-cache@v2
with:
shared-key: "check"
Expand All @@ -82,7 +82,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.74.1
toolchain: 1.81.0
components: clippy
override: true
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.74.1
toolchain: 1.81.0
override: true
- uses: Swatinem/rust-cache@v2
with:
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.74.1
toolchain: 1.81.0
components: rustfmt
override: true
- uses: actions/checkout@v3
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.74.1
toolchain: 1.81.0
components: rustfmt
override: true
- uses: Swatinem/rust-cache@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/link-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: 18
- name: Install markdown-link-check
run: npm install -g markdown-link-check
- name: Check links in markdown files
Expand Down
Loading

0 comments on commit 1965bec

Please sign in to comment.