From 84c5c03da474ed637a416dcb2f14505d0b24b14a Mon Sep 17 00:00:00 2001 From: lapla Date: Sun, 31 May 2026 21:04:01 +0900 Subject: [PATCH 1/5] Simplify taplo install in CI --- .github/workflows/ci.yml | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5abf05b6a..6d94e49db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,12 +67,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 @@ -87,6 +81,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 }} @@ -190,12 +186,6 @@ 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 @@ -203,7 +193,7 @@ jobs: 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 @@ -264,12 +254,8 @@ jobs: - 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 + - name: Install taplo + uses: taiki-e/install-action@taplo - run: taplo format --check --diff spelling: From 79737920d30f941dd33681ad0dcf918fca51d852 Mon Sep 17 00:00:00 2001 From: lapla Date: Sun, 31 May 2026 21:30:13 +0900 Subject: [PATCH 2/5] Preserve PATH in Tumbleweed --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d94e49db..595cefc44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} From 6f66c07fd85ebd7fb09a1237fd4fda83bed09e6e Mon Sep 17 00:00:00 2001 From: lapla Date: Sun, 31 May 2026 21:31:46 +0900 Subject: [PATCH 3/5] Exclude `external_test_suites` files from TOML formatting --- taplo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taplo.toml b/taplo.toml index fb96acae6..387dc0783 100644 --- a/taplo.toml +++ b/taplo.toml @@ -1,5 +1,5 @@ exclude = [ ".cargo-home/**", - "external_test_suites/mold/third-party/blake3/Cargo.toml", + "external_test_suites/**", "target/**", ] From e6850e49dd8587b236a24cfb3d88633f44a3d3d2 Mon Sep 17 00:00:00 2001 From: lapla Date: Sun, 31 May 2026 21:33:40 +0900 Subject: [PATCH 4/5] Remove taplo diff display job --- .github/workflows/ci.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 595cefc44..c39e55ed2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,18 +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 - uses: taiki-e/install-action@taplo - - run: taplo format --check --diff - spelling: name: Spell Check with Typos runs-on: ubuntu-24.04 From e93f872c1bccc7410df0ea521fd1d267a6add684 Mon Sep 17 00:00:00 2001 From: lapla Date: Sun, 31 May 2026 21:38:16 +0900 Subject: [PATCH 5/5] Run `taplo format` --- taplo.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/taplo.toml b/taplo.toml index 387dc0783..b3b3b40af 100644 --- a/taplo.toml +++ b/taplo.toml @@ -1,5 +1 @@ -exclude = [ - ".cargo-home/**", - "external_test_suites/**", - "target/**", -] +exclude = [".cargo-home/**", "external_test_suites/**", "target/**"]