Skip to content

Commit

Permalink
Merge branch 'master' into const-int
Browse files Browse the repository at this point in the history
  • Loading branch information
ordian authored Nov 4, 2024
2 parents 7aec38d + 315299d commit 614f683
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,13 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.74.0
toolchain: 1.75.0
override: true

- name: Rust Cache
uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5

- run: rustup target add wasm32-unknown-unknown
- run: rustup target add mips64-unknown-linux-muslabi64

- name: Test no-default-features
uses: actions-rs/cargo@v1
Expand Down Expand Up @@ -117,14 +116,6 @@ jobs:
command: test
args: -p bounded-collections --all-features

- name: Test uint on bigendian
if: runner.os == 'Linux'
uses: actions-rs/cargo@v1
with:
use-cross: true
command: test
args: -p uint --target=mips64-unknown-linux-muslabi64

test_windows:
name: Test Windows
runs-on: windows-latest
Expand All @@ -144,7 +135,6 @@ jobs:
command: test
args: --workspace --exclude kvdb-rocksdb


fmt:
name: Rustfmt
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion bounded-collections/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0"
homepage = "https://github.com/paritytech/parity-common"
description = "Bounded types and their supporting traits"
edition = "2021"
rust-version = "1.60.0"
rust-version = "1.75.0"

[dependencies]
serde = { version = "1.0.101", default-features = false, optional = true, features=["alloc", "derive"] }
Expand Down

0 comments on commit 614f683

Please sign in to comment.