Skip to content

chore: Simplify taplo install in CI #2004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lapla-cogito merged 5 commits into from
May 31, 2026
+7 −34
Merged

chore: Simplify taplo install in CI #2004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84c5c03
Simplify taplo install in CI
lapla-cogito May 31, 2026
7973792
Preserve PATH in Tumbleweed
lapla-cogito May 31, 2026
6f66c07
Exclude `external_test_suites` files from TOML formatting
lapla-cogito May 31, 2026
e6850e4
Remove taplo diff display job
lapla-cogito May 31, 2026
e93f872
Run `taplo format`
lapla-cogito May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 6 additions & 29 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ jobs:
image: ${{ matrix.container }}

steps:
# https://github.com/actions/runner/issues/3210
- run: echo "$PATH" >> "$GITHUB_PATH"
if: ${{ contains(matrix.container, 'opensuse') }}
- run: echo "WILD_TEST_CONFIG=test-config-ci.toml" >> $GITHUB_ENV
- run: echo "WILD_TEST_CROSS=all" >> $GITHUB_ENV
if: ${{ matrix.test-qemu }}
Expand All @@ -67,12 +70,6 @@ jobs:
if: ${{ contains(matrix.container, 'opensuse') }}
- run: apk add build-base lld clang clang-extra-tools bash curl tar
if: ${{ contains(matrix.container, 'alpine') }}
- name: Install Taplo (x86_64)
if: ${{ runner.arch == 'X64' }}
run: curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-linux-x86_64.gz | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
- name: Install Taplo (AArch64)
if: ${{ runner.arch == 'ARM64' }}
run: curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-linux-aarch64.gz | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
- uses: actions/checkout@v6
with:
persist-credentials: false
Expand All @@ -87,6 +84,8 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
key: ${{ runner.os }}-${{ matrix.container }}-${{ matrix.runs-on }}
- name: Install taplo
uses: taiki-e/install-action@taplo
- run: cargo build --profile ci --workspace --no-default-features
- run: cargo test --profile ci --features plugins
if: ${{ matrix.test-plugins }}
Expand Down Expand Up @@ -190,20 +189,14 @@ jobs:
timeout-minutes: 10
steps:
- run: sudo apt-get update && sudo apt-get -y install gcc g++ clang clang-format lld curl
- name: Install Taplo (x86_64)
if: ${{ runner.arch == 'X64' }}
run: curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-linux-x86_64.gz | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
- name: Install Taplo (AArch64)
if: ${{ runner.arch == 'ARM64' }}
run: curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-linux-aarch64.gz | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
- uses: actions/checkout@v6
with:
persist-credentials: false
- uses: dtolnay/rust-toolchain@stable
id: rust-toolchain
- uses: taiki-e/install-action@v2
with:
tool: cargo-hack,cargo-minimal-versions
tool: cargo-hack,cargo-minimal-versions,taplo
- uses: Swatinem/rust-cache@v2
- run: cargo minimal-versions --direct test --profile ci

Expand Down Expand Up @@ -256,22 +249,6 @@ jobs:
- run: echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
- run: yamlfmt -lint .

taplo:
name: TOML format
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v6
with:
persist-credentials: false
- name: Install Taplo (x86_64)
if: ${{ runner.arch == 'X64' }}
run: curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-linux-x86_64.gz | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
- name: Install Taplo (AArch64)
if: ${{ runner.arch == 'ARM64' }}
run: curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-linux-aarch64.gz | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
- run: taplo format --check --diff
Copy link
Copy Markdown
Member Author

@lapla-cogito lapla-cogito May 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH I don't understand the purpose behind this job that only displays diffs (which is why I removed it). Seeing other tidy tests like clang-format, this job is likely unnecessary.

Copy link
Copy Markdown
Collaborator

@marxin marxin May 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point!


spelling:
name: Spell Check with Typos
runs-on: ubuntu-24.04
Expand Down
6 changes: 1 addition & 5 deletions taplo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
exclude = [
".cargo-home/**",
"external_test_suites/mold/third-party/blake3/Cargo.toml",
Copy link
Copy Markdown
Member Author

@lapla-cogito lapla-cogito May 31, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Considering future updates to external tests, all files under external_test_suites should be included as ignored-files.

"target/**",
]
exclude = [".cargo-home/**", "external_test_suites/**", "target/**"]
Loading