From 21162b5e5e377394627b49975456a61b356c1690 Mon Sep 17 00:00:00 2001 From: "Garen J. Torikian" Date: Wed, 3 Jan 2024 17:44:22 -0500 Subject: [PATCH 1/3] modernize Cargo defs --- Cargo.toml | 1 + ext/commonmarker/Cargo.toml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cd0319bb..81a25640 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,3 +4,4 @@ [workspace] members = ["ext/commonmarker"] +resolver = "2" diff --git a/ext/commonmarker/Cargo.toml b/ext/commonmarker/Cargo.toml index 5eeedf6c..bd8306ca 100644 --- a/ext/commonmarker/Cargo.toml +++ b/ext/commonmarker/Cargo.toml @@ -2,9 +2,11 @@ name = "commonmarker" version = "1.0.0" edition = "2021" +rust-version = "1.75.0" +publish = false [dependencies] -magnus = "0.6" +magnus = "0.6" comrak = { version = "0.20", features = ["shortcodes"] } syntect = { version = "5.1", features = ["plist-load"] } From e483fd36963758e322eaea97c0c5d756121c11c4 Mon Sep 17 00:00:00 2001 From: "Garen J. Torikian" Date: Wed, 3 Jan 2024 17:47:39 -0500 Subject: [PATCH 2/3] improve lint test --- .github/workflows/lint.yml | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8dea7c74..1780d494 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,18 +21,31 @@ jobs: clippy_format: runs-on: ubuntu-latest - strategy: - matrix: - rust: - - stable + steps: - uses: actions/checkout@v4 + with: + submodules: true - - name: Obtain Rust - run: rustup override set ${{ matrix.rust }} + - name: Set up Rust + id: toolchain + uses: dtolnay/rust-toolchain@stable + with: + components: clippy, rustfmt + + - uses: actions/cache@v3 + with: + path: | + ~/.cargo/bin/ + ~/.cargo/registry/index/ + ~/.cargo/registry/cache/ + ~/.cargo/git/db/ + tmp/ + target/ + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-v1 - name: Check clippy - run: rustup component add clippy && cargo clippy + run: cargo clippy - name: Check formatting - run: rustup component add rustfmt && cargo fmt -- --check + run: cargo fmt -- --check From 75e55eb32a5f85e58b01cca202822117093e2b2d Mon Sep 17 00:00:00 2001 From: "Garen J. Torikian" Date: Wed, 3 Jan 2024 17:47:45 -0500 Subject: [PATCH 3/3] :gem: 1.0.4 --- lib/commonmarker/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/commonmarker/version.rb b/lib/commonmarker/version.rb index d16555b0..e0087e32 100644 --- a/lib/commonmarker/version.rb +++ b/lib/commonmarker/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Commonmarker - VERSION = "1.0.3" + VERSION = "1.0.4" end