Skip to content

Commit 4d14ade

Browse files
magiclenmagiclen
committed
update MSRV
1 parent 9c0b34a commit 4d14ade

File tree

3 files changed

+108
-12
lines changed

3 files changed

+108
-12
lines changed

‎.github/workflows/ci-version.yml‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
sudo apt update
3333
sudo apt install musl-tools
3434
if: matrix.target == 'x86_64-unknown-linux-musl'
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636
- uses: actions-rust-lang/setup-rust-toolchain@v1
3737
with:
3838
toolchain: ${{ matrix.toolchain }}
@@ -56,10 +56,59 @@ jobs:
5656
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})
5757
runs-on: ${{ matrix.os }}
5858
steps:
59-
- uses: actions/checkout@v3
59+
- uses: actions/checkout@v4
6060
- uses: actions-rust-lang/setup-rust-toolchain@v1
6161
with:
6262
toolchain: ${{ matrix.toolchain }}
6363
target: ${{ matrix.target }}
6464
- run: cargo test --release ${{ matrix.features }}
65-
- run: cargo doc --release ${{ matrix.features }}
65+
- run: cargo doc --release ${{ matrix.features }}
66+
67+
MSRV-1:
68+
strategy:
69+
fail-fast: false
70+
matrix:
71+
os:
72+
- ubuntu-latest
73+
toolchain:
74+
- 1.61
75+
target:
76+
- x86_64-unknown-linux-gnu
77+
- x86_64-unknown-linux-musl
78+
features:
79+
-
80+
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} to ${{ matrix.target }} (${{ matrix.features }})
81+
runs-on: ${{ matrix.os }}
82+
steps:
83+
- name: Install musl-tools (Linux)
84+
run: |
85+
sudo apt update
86+
sudo apt install musl-tools
87+
if: matrix.target == 'x86_64-unknown-linux-musl'
88+
- uses: actions/checkout@v4
89+
- uses: actions-rust-lang/setup-rust-toolchain@v1
90+
with:
91+
toolchain: ${{ matrix.toolchain }}
92+
target: ${{ matrix.target }}
93+
- run: cargo test --release --lib --bins --target ${{ matrix.target }} ${{ matrix.features }}
94+
95+
MSRV-2:
96+
strategy:
97+
fail-fast: false
98+
matrix:
99+
os:
100+
- macos-latest
101+
- windows-latest
102+
toolchain:
103+
- 1.61
104+
features:
105+
-
106+
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})
107+
runs-on: ${{ matrix.os }}
108+
steps:
109+
- uses: actions/checkout@v4
110+
- uses: actions-rust-lang/setup-rust-toolchain@v1
111+
with:
112+
toolchain: ${{ matrix.toolchain }}
113+
target: ${{ matrix.target }}
114+
- run: cargo test --release --lib --bins ${{ matrix.features }}

‎.github/workflows/ci.yml‎

Lines changed: 54 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
rustfmt:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- uses: actions-rust-lang/setup-rust-toolchain@v1
1414
with:
1515
toolchain: nightly
@@ -19,7 +19,7 @@ jobs:
1919
clippy:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- uses: actions-rust-lang/setup-rust-toolchain@v1
2424
with:
2525
components: clippy
@@ -32,7 +32,6 @@ jobs:
3232
os:
3333
- ubuntu-latest
3434
toolchain:
35-
- 1.59
3635
- stable
3736
- nightly
3837
target:
@@ -48,7 +47,7 @@ jobs:
4847
sudo apt update
4948
sudo apt install musl-tools
5049
if: matrix.target == 'x86_64-unknown-linux-musl'
51-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5251
- uses: actions-rust-lang/setup-rust-toolchain@v1
5352
with:
5453
toolchain: ${{ matrix.toolchain }}
@@ -64,18 +63,66 @@ jobs:
6463
- macos-latest
6564
- windows-latest
6665
toolchain:
67-
- 1.59
6866
- stable
6967
- nightly
7068
features:
7169
-
7270
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})
7371
runs-on: ${{ matrix.os }}
7472
steps:
75-
- uses: actions/checkout@v3
73+
- uses: actions/checkout@v4
7674
- uses: actions-rust-lang/setup-rust-toolchain@v1
7775
with:
7876
toolchain: ${{ matrix.toolchain }}
7977
target: ${{ matrix.target }}
8078
- run: cargo test ${{ matrix.features }}
81-
- run: cargo doc ${{ matrix.features }}
79+
- run: cargo doc ${{ matrix.features }}
80+
81+
MSRV-1:
82+
strategy:
83+
fail-fast: false
84+
matrix:
85+
os:
86+
- ubuntu-latest
87+
toolchain:
88+
- 1.61
89+
target:
90+
- x86_64-unknown-linux-gnu
91+
- x86_64-unknown-linux-musl
92+
features:
93+
-
94+
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} to ${{ matrix.target }} (${{ matrix.features }})
95+
runs-on: ${{ matrix.os }}
96+
steps:
97+
- name: Install musl-tools (Linux)
98+
run: |
99+
sudo apt update
100+
sudo apt install musl-tools
101+
if: matrix.target == 'x86_64-unknown-linux-musl'
102+
- uses: actions/checkout@v4
103+
- uses: actions-rust-lang/setup-rust-toolchain@v1
104+
with:
105+
toolchain: ${{ matrix.toolchain }}
106+
target: ${{ matrix.target }}
107+
- run: cargo test --lib --bins --target ${{ matrix.target }} ${{ matrix.features }}
108+
109+
MSRV-2:
110+
strategy:
111+
fail-fast: false
112+
matrix:
113+
os:
114+
- macos-latest
115+
- windows-latest
116+
toolchain:
117+
- 1.61
118+
features:
119+
-
120+
name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})
121+
runs-on: ${{ matrix.os }}
122+
steps:
123+
- uses: actions/checkout@v4
124+
- uses: actions-rust-lang/setup-rust-toolchain@v1
125+
with:
126+
toolchain: ${{ matrix.toolchain }}
127+
target: ${{ matrix.target }}
128+
- run: cargo test --lib --bins ${{ matrix.features }}

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[package]
22
name = "markdown2html-converter"
3-
version = "1.1.10"
3+
version = "1.1.11"
44
authors = ["Magic Len <[email protected]>"]
55
edition = "2021"
6-
rust-version = "1.59"
6+
rust-version = "1.61"
77
repository = "https://github.com/magiclen/markdown2html-converter"
88
homepage = "https://magiclen.org/markdown2html-converter"
99
keywords = ["markdown", "html", "MathJax", "LaTeX", "highlight"]

0 commit comments

Comments
 (0)