Skip to content

Commit 33ac2c1

Browse files
authored
Merge pull request #74 from rust-math/cargo-upgrade
Set minimal supported rustc version to 1.56.0, cargo upgrade
2 parents 95c71ae + b8f311d commit 33ac2c1

File tree

7 files changed

+69
-18
lines changed

7 files changed

+69
-18
lines changed

.github/workflows/intel-mkl-sys.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ jobs:
1919
runs-on: windows-2019
2020
steps:
2121
- uses: actions/checkout@v1
22+
- uses: actions-rs/toolchain@v1
23+
with:
24+
toolchain: "1.56.0"
25+
profile: minimal
26+
default: true
27+
override: true
2228
- uses: actions-rs/cargo@v1
2329
with:
2430
command: test
@@ -39,6 +45,12 @@ jobs:
3945
runs-on: macos-10.15
4046
steps:
4147
- uses: actions/checkout@v1
48+
- uses: actions-rs/toolchain@v1
49+
with:
50+
toolchain: "1.56.0"
51+
profile: minimal
52+
default: true
53+
override: true
4254
- uses: actions-rs/cargo@v1
4355
with:
4456
command: test
@@ -60,9 +72,15 @@ jobs:
6072
- mkl-dynamic-lp64-seq
6173
- mkl-dynamic-ilp64-iomp
6274
- mkl-dynamic-ilp64-seq
63-
runs-on: ubuntu-18.04
75+
runs-on: ubuntu-22.04
6476
steps:
6577
- uses: actions/checkout@v1
78+
- uses: actions-rs/toolchain@v1
79+
with:
80+
toolchain: "1.56.0"
81+
profile: minimal
82+
default: true
83+
override: true
6684
- uses: actions-rs/cargo@v1
6785
with:
6886
command: test

.github/workflows/intel-mkl-tool.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,16 @@ jobs:
1414
os:
1515
- windows-2019
1616
- macos-10.15
17-
- ubuntu-18.04
17+
- ubuntu-22.04
1818
runs-on: ${{ matrix.os }}
1919
steps:
2020
- uses: actions/checkout@v1
21+
- uses: actions-rs/toolchain@v1
22+
with:
23+
toolchain: "1.56.0"
24+
profile: minimal
25+
default: true
26+
override: true
2127
- uses: actions-rs/cargo@v1
2228
with:
2329
command: test
@@ -30,7 +36,7 @@ jobs:
3036
name: cargo-test no-default-features
3137

3238
docker:
33-
runs-on: ubuntu-18.04
39+
runs-on: ubuntu-22.04
3440
strategy:
3541
fail-fast: false
3642
matrix:

.github/workflows/rust.yml

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

33
on:
44
push:
@@ -8,10 +8,32 @@ on:
88

99
jobs:
1010
check-format:
11-
runs-on: ubuntu-18.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/checkout@v1
14+
- uses: actions-rs/toolchain@v1
15+
with:
16+
toolchain: "1.56.0"
17+
profile: minimal
18+
components: rustfmt
19+
default: true
20+
override: true
1421
- uses: actions-rs/cargo@v1
1522
with:
1623
command: fmt
1724
args: -- --check
25+
26+
clippy:
27+
runs-on: ubuntu-22.04
28+
steps:
29+
- uses: actions/checkout@v1
30+
- uses: actions-rs/toolchain@v1
31+
with:
32+
toolchain: "1.56.0"
33+
profile: minimal
34+
components: clippy
35+
default: true
36+
override: true
37+
- uses: actions-rs/cargo@v1
38+
with:
39+
command: clippy

intel-mkl-src/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ version = "0.6.0+mkl2020.1"
44
authors = ["Toshiki Teramura <toshiki.teramura@gmail.com>"]
55
edition = "2018"
66

7+
rust-version = "1.56.0" # MSRV is introduced
8+
79
description = "Redistribution of Intel(R) MKL as a crate"
810
repository = "https://github.com/rust-math/intel-mkl-src"
911
keywords = ["fft", "blas", "lapack"]
@@ -33,5 +35,5 @@ download = ["intel-mkl-tool/archive"]
3335
xdg-data-home = []
3436

3537
[build-dependencies]
36-
anyhow = "1"
38+
anyhow = "1.0.58"
3739
intel-mkl-tool = { version = "0.2.0", path = "../intel-mkl-tool", default-features = false }

intel-mkl-sys/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ version = "0.2.0+mkl2020.1"
44
authors = ["Toshiki Teramura <toshiki.teramura@gmail.com>"]
55
edition = "2018"
66

7+
rust-version = "1.56.0" # MSRV is introduced
8+
79
description = "FFI for Intel(R) MKL"
810
repository = "https://github.com/rust-math/intel-mkl-src"
911
keywords = ["ffi"]
@@ -30,9 +32,9 @@ download = ["intel-mkl-src/download"]
3032
intel-mkl-src = { path = "../intel-mkl-src", version = "0.6.0", default-features = false }
3133

3234
[dev-dependencies]
33-
criterion = "0.3.0"
34-
rand = "0.7.2"
35-
approx = "0.3.2"
35+
criterion = "0.3.6"
36+
rand = "0.8.5"
37+
approx = "0.5.1"
3638

3739
[[bench]]
3840
name = "cos"

intel-mkl-tool/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ archive = ["curl", "tar", "zstd"]
1616
cli = ["structopt", "archive"]
1717

1818
[dependencies]
19-
anyhow = "1.0.31"
20-
derive_more = "0.99.8"
21-
dirs = "2.0.2"
19+
anyhow = "1.0.58"
20+
derive_more = "0.99.17"
21+
dirs = "4.0.0"
2222
glob = "0.3.0"
23-
pkg-config = "0.3.17"
23+
pkg-config = "0.3.25"
2424

2525
# archive
26-
curl = { version = "0.4.29", optional = true }
27-
tar = { version = "0.4.29", optional = true }
28-
zstd = { version = "<=0.11, >=0.6", optional = true }
26+
curl = { version = "0.4.44", optional = true }
27+
tar = { version = "0.4.38", optional = true }
28+
zstd = { version = "0.11.2", optional = true }
2929

3030
# CLI
31-
structopt = { version = "0.3.15", optional = true }
31+
structopt = { version = "0.3.26", optional = true }
3232

3333
[dev-dependencies]
34-
paste = "0.1.17"
34+
paste = "1.0.7"
3535

3636
[[bin]]
3737
name = "intel-mkl-tool"

rust-toolchain

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.56.0

0 commit comments

Comments
 (0)