From 71a2b2e8d01175e763a9c8ce679aaa5c5173d4f0 Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Tue, 10 Sep 2024 22:20:32 +0200 Subject: [PATCH] Bump GitHub action workflows to their latest versions --- .github/workflows/coverage.yml | 4 ++-- .github/workflows/deploy_docs.yml | 8 ++++---- .github/workflows/release.yml | 8 ++++---- .github/workflows/test.yml | 16 ++++++++-------- manual/book.toml | 2 +- manual/src/tree_diffing.md | 4 +--- src/parse/syntax.rs | 2 +- translation/zh-CN/manual-zh-CN/book.toml | 2 +- 8 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 76d4f6835a..0793e83d95 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -6,7 +6,7 @@ jobs: coverage: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust run: rustup toolchain install stable --component llvm-tools-preview @@ -16,7 +16,7 @@ jobs: - name: Generate code coverage run: cargo +stable llvm-cov --all-features --workspace --lcov --output-path lcov.info - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: lcov.info fail_ci_if_error: false diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index da23e8dbe1..fc48739028 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -22,7 +22,7 @@ jobs: if: needs.pre_deploy.outputs.should_skip != 'true' runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install jq run: sudo apt-get install -y jq @@ -31,9 +31,9 @@ jobs: - run: cargo doc - name: Setup mdBook - uses: peaceiris/actions-mdbook@v1 + uses: peaceiris/actions-mdbook@v2 with: - mdbook-version: '0.4.34' + mdbook-version: '0.4.40' - name: Build manual run: mdbook build @@ -53,7 +53,7 @@ jobs: run: cp -r homepage/* manual/book/ - name: Deploy to GitHub pages - uses: JamesIves/github-pages-deploy-action@v4.4.3 + uses: JamesIves/github-pages-deploy-action@v4.6.4 with: branch: gh-pages folder: manual/book diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d0872ce14f..8176454d0b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: create-release: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: taiki-e/create-gh-release-action@v1 with: # Create a draft release so we can add the changelog before publishing it @@ -46,7 +46,7 @@ jobs: os: macos-latest runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: taiki-e/upload-rust-binary-action@v1 with: bin: difft @@ -63,7 +63,7 @@ jobs: push_crates_io: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - uses: katyo/publish-crates@v1 + - uses: actions/checkout@v4 + - uses: katyo/publish-crates@v2 with: registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 89494dd8d6..756290eb8a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Rust toolchain uses: dtolnay/rust-toolchain@1.65.0 @@ -65,7 +65,7 @@ jobs: name: Test with MIME database runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@1.65.0 # This runs tests that rely on the MIME database being present. - run: cargo test -- --ignored @@ -74,7 +74,7 @@ jobs: name: Test Linux (latest stable Rust) runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - run: cargo +stable test @@ -82,7 +82,7 @@ jobs: name: Output Regression Test runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@1.65.0 - name: Generate output for all sample files run: ./sample_files/compare_all.sh @@ -93,7 +93,7 @@ jobs: name: Check Linux Packaging runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@1.65.0 - run: cargo package --allow-dirty @@ -101,7 +101,7 @@ jobs: name: Rustfmt runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@1.65.0 - run: cargo fmt --all -- --check @@ -109,7 +109,7 @@ jobs: name: Actionlint runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - uses: raven-actions/actionlint@v1 + - uses: actions/checkout@v4 + - uses: raven-actions/actionlint@v2 with: shellcheck: false diff --git a/manual/book.toml b/manual/book.toml index 56a4776615..978b9a743e 100644 --- a/manual/book.toml +++ b/manual/book.toml @@ -3,7 +3,7 @@ authors = ["Wilfred Hughes"] language = "en" src = "src" title = "Difftastic Manual" -description = "The manual for difftastic, the structural dif tool" +description = "The manual for difftastic, the structural diff tool" [output.html] git-repository-url = "https://github.com/wilfred/difftastic" diff --git a/manual/src/tree_diffing.md b/manual/src/tree_diffing.md index 5c4c22c92f..895edf39e0 100644 --- a/manual/src/tree_diffing.md +++ b/manual/src/tree_diffing.md @@ -32,7 +32,7 @@ Languages: [~10 programming languages](https://github.com/GumTreeDiff/gumtree/wiki/Languages) Parser: Several, including [srcML](https://www.srcml.org/) Algorithm: Top-down, then bottom-up -Ouput: HTML, Swing GUI, or text +Output: HTML, Swing GUI, or text [GumTree](https://github.com/GumTreeDiff/gumtree) can parse several programming languages and then performs a tree-based diff, outputting @@ -116,5 +116,3 @@ Output: CLI colours [Semantically meaningful S-expression diff: Tree-diff for lisp source code](https://archive.fosdem.org/2021/schedule/event/sexpressiondiff/) was presented at FOSDEM 2021. - - diff --git a/src/parse/syntax.rs b/src/parse/syntax.rs index ab2cafcc6a..911eba473d 100644 --- a/src/parse/syntax.rs +++ b/src/parse/syntax.rs @@ -1103,7 +1103,7 @@ mod tests { } } - /// Ignore the syntax highighting kind when comparing + /// Ignore the syntax highlighting kind when comparing /// atoms. Sometimes changing delimiter wrapping can change /// whether a parser thinks that a node is e.g. a type. #[test] diff --git a/translation/zh-CN/manual-zh-CN/book.toml b/translation/zh-CN/manual-zh-CN/book.toml index ba55ea73e3..5ad05d8d71 100644 --- a/translation/zh-CN/manual-zh-CN/book.toml +++ b/translation/zh-CN/manual-zh-CN/book.toml @@ -3,7 +3,7 @@ authors = ["Wilfred Hughes"] language = "zh-CN" src = "src" title = "Difftastic Manual" -description = "The manual for difftastic, the structural dif tool" +description = "The manual for difftastic, the structural diff tool" [output.html] git-repository-url = "https://github.com/wilfred/difftastic"