Skip to content

Commit 973f4ae

Browse files
authored
Merge pull request #271 from gjtorikian/native-33
Builds on behalf of Ruby 3.3
2 parents f84848b + 75e55eb commit 973f4ae

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

.github/workflows/lint.yml

+21-8
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,31 @@ jobs:
2121

2222
clippy_format:
2323
runs-on: ubuntu-latest
24-
strategy:
25-
matrix:
26-
rust:
27-
- stable
24+
2825
steps:
2926
- uses: actions/checkout@v4
27+
with:
28+
submodules: true
3029

31-
- name: Obtain Rust
32-
run: rustup override set ${{ matrix.rust }}
30+
- name: Set up Rust
31+
id: toolchain
32+
uses: dtolnay/rust-toolchain@stable
33+
with:
34+
components: clippy, rustfmt
35+
36+
- uses: actions/cache@v3
37+
with:
38+
path: |
39+
~/.cargo/bin/
40+
~/.cargo/registry/index/
41+
~/.cargo/registry/cache/
42+
~/.cargo/git/db/
43+
tmp/
44+
target/
45+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-v1
3346

3447
- name: Check clippy
35-
run: rustup component add clippy && cargo clippy
48+
run: cargo clippy
3649

3750
- name: Check formatting
38-
run: rustup component add rustfmt && cargo fmt -- --check
51+
run: cargo fmt -- --check

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44

55
[workspace]
66
members = ["ext/commonmarker"]
7+
resolver = "2"

ext/commonmarker/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "commonmarker"
33
version = "1.0.0"
44
edition = "2021"
5+
rust-version = "1.75.0"
6+
publish = false
57

68
[dependencies]
7-
magnus = "0.6"
9+
magnus = "0.6"
810
comrak = { version = "0.20", features = ["shortcodes"] }
911
syntect = { version = "5.1", features = ["plist-load"] }
1012

lib/commonmarker/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module Commonmarker
4-
VERSION = "1.0.3"
4+
VERSION = "1.0.4"
55
end

0 commit comments

Comments
 (0)