Skip to content

Commit

Permalink
Bump GitHub action workflows to their latest versions
Browse files Browse the repository at this point in the history
  • Loading branch information
deining authored and Wilfred committed Sep 12, 2024
1 parent 6bbeb53 commit 5ecf3c1
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

steps:
- name: Checkout source code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: dtolnay/[email protected]
Expand Down Expand Up @@ -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/[email protected]
# This runs tests that rely on the MIME database being present.
- run: cargo test -- --ignored
Expand All @@ -74,15 +74,15 @@ 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

regression_test:
name: Output Regression Test
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/[email protected]
- name: Generate output for all sample files
run: ./sample_files/compare_all.sh
Expand All @@ -93,23 +93,23 @@ jobs:
name: Check Linux Packaging
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/[email protected]
- run: cargo package --allow-dirty

fmt:
name: Rustfmt
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/[email protected]
- run: cargo fmt --all -- --check

actionlint:
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
2 changes: 1 addition & 1 deletion manual/book.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 1 addition & 3 deletions manual/src/tree_diffing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.


2 changes: 1 addition & 1 deletion src/parse/syntax.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion translation/zh-CN/manual-zh-CN/book.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 5ecf3c1

Please sign in to comment.