diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0f6417a..8d1a825 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,14 +18,10 @@ jobs: uses: actions/checkout@v4 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true + uses: dtolnay/rust-toolchain@stable - name: Publish on crates.io - run: cargo publish --features full --token ${{ secrets.CRATES_TOKEN }} + run: cargo publish --token ${{ secrets.CRATES_TOKEN }} check-publish: name: Check Publish runs-on: ubuntu-latest @@ -35,11 +31,7 @@ jobs: uses: actions/checkout@v4 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true + uses: dtolnay/rust-toolchain@stable - name: Check if can publish on crates.io - run: cargo publish --features cli --token ${{ secrets.CRATES_TOKEN }} --dry-run -v + run: cargo publish --token ${{ secrets.CRATES_TOKEN }} --dry-run -v diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 042412e..325ca40 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,13 +74,17 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Install Rust - uses: actions-rs/toolchain@v1 + + - name: Install stable toolchain + uses: dtolnay/rust-toolchain@stable with: - toolchain: stable target: ${{ matrix.target }} - override: true - profile: minimal + + - name: Install cross + if: matrix.cross == true + uses: taiki-e/install-action@v2 + with: + tool: cross - name: Setup variables shell: bash @@ -92,12 +96,14 @@ jobs: run: | echo "target flag is: ${{ env.TARGET_FLAGS }}" echo "target dir is: ${{ env.TARGET_DIR }}" - - name: Build release binary - uses: actions-rs/cargo@v1 - with: - use-cross: ${{ matrix.cross }} - command: build - args: --verbose --release --no-default-features --features full,native-tls-vendored ${{ env.TARGET_FLAGS }} + + - name: Build release binary (with cross) + if: matrix.cross == true + run: cross build --verbose --release --no-default-features --features full,native-tls-vendored ${{ env.TARGET_FLAGS }} + + - name: Build release binary (with cargo) + if: matrix.cross == false + run: cargo build --verbose --release --no-default-features --features full,native-tls-vendored ${{ env.TARGET_FLAGS }} - name: Strip release binary (linux and macos) if: matrix.build == 'linux' || matrix.build == 'macos' diff --git a/.github/workflows/rustmsrv.yml b/.github/workflows/rustmsrv.yml index 45e58f4..31aef7a 100644 --- a/.github/workflows/rustmsrv.yml +++ b/.github/workflows/rustmsrv.yml @@ -17,11 +17,9 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Install Cargo MSRV - uses: actions-rs/install@v0.1 + uses: taiki-e/install-action@v2 with: - crate: cargo-msrv - version: latest - use-tool-cache: true + tool: cargo-msrv - name: Check MSRV run: cargo msrv verify -- cargo check --all-features diff --git a/Cargo.lock b/Cargo.lock index f87ce6c..5a18d77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1106,7 +1106,7 @@ dependencies = [ [[package]] name = "languagetool-rust" -version = "2.1.4" +version = "3.0.0-rc.1" dependencies = [ "annotate-snippets", "assert_cmd", @@ -1589,9 +1589,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.13.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0" +checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" dependencies = [ "bitflags", "getopts", @@ -1602,9 +1602,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-escape" -version = "0.11.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" +checksum = "bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3" [[package]] name = "quote" diff --git a/Cargo.toml b/Cargo.toml index ceef6cf..d4c4235 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ is-terminal = {version = "0.4", optional = true} lifetime = {version = "0.1", features = ["macros"]} log = {version = "0.4", optional = true} pretty_env_logger = {version = "0.5", optional = true} -pulldown-cmark = {version = "0.13", optional = true} +pulldown-cmark = {version = "0.10", optional = true} reqwest = {version = "0.12", default-features = false, features = ["json"]} scraper = {version = "0.23", optional = true} serde = {version = "1.0", features = ["derive"]} @@ -94,7 +94,7 @@ name = "languagetool-rust" readme = "README.md" repository = "https://github.com/jeertmans/languagetool-rust" rust-version = "1.82.0" -version = "2.1.4" +version = "3.0.0-rc.1" [package.metadata.docs.rs] all-features = true