From c5f72f3042893796da28835ee5d21337f1b9bb14 Mon Sep 17 00:00:00 2001 From: xxchan Date: Fri, 27 Dec 2024 15:50:52 +0800 Subject: [PATCH 1/4] ci: use taiki-e/install-action to install tools from binary instead of compiling from source need to wait for INFRA approval https://issues.apache.org/jira/browse/INFRA-26400 Signed-off-by: xxchan --- .github/workflows/ci.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38f450bf7..b68b26b5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,11 +46,12 @@ jobs: - name: Check License Header uses: apache/skywalking-eyes/header@v0.6.0 - - name: Install cargo-sort - run: make install-cargo-sort - - name: Install taplo-cli - run: make install-taplo-cli + uses: taiki-e/install-action@v2 + with: + tool: taplo-cli@0.9.0 + - name: Check toml format + run: make check-toml - name: Cargo format run: make check-fmt @@ -61,9 +62,17 @@ jobs: - name: Cargo clippy run: make check-clippy + - name: Install cargo-sort + uses: taiki-e/install-action@v2 + with: + tool: cargo-sort@1.0.9 - name: Cargo sort run: make cargo-sort + - name: Install cargo-machete + uses: taiki-e/install-action@v2 + with: + tool: cargo-machete - name: Cargo Machete run: make cargo-machete From f752cae214c2771723d223cbecda2db03621f04a Mon Sep 17 00:00:00 2001 From: xxchan Date: Fri, 3 Jan 2025 17:45:11 +0800 Subject: [PATCH 2/4] bump taplo to fix openssl issue Signed-off-by: xxchan --- .github/workflows/ci.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 029c89c87..59650fde6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: - name: Install taplo-cli uses: taiki-e/install-action@v2 with: - tool: taplo-cli@0.9.0 + tool: taplo-cli@0.9.3 - name: Check toml format run: make check-toml diff --git a/Makefile b/Makefile index 4ecc9bd88..fc8a52e5f 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ cargo-machete: install-cargo-machete cargo machete install-taplo-cli: - cargo install taplo-cli@0.9.0 + cargo install taplo-cli@0.9.3 fix-toml: install-taplo-cli taplo fmt From dfb3e0d8cc7e3273557cb952081908930d613167 Mon Sep 17 00:00:00 2001 From: xxchan Date: Fri, 3 Jan 2025 17:58:43 +0800 Subject: [PATCH 3/4] fix cargo sort Signed-off-by: xxchan --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59650fde6..5ffdc3527 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: with: tool: cargo-sort@1.0.9 - name: Cargo sort - run: make cargo-sort + run: cargo sort -c -w - name: Install cargo-machete uses: taiki-e/install-action@v2 From aef6634865c7f113fc51f21574f8e5ab7d7cb9ba Mon Sep 17 00:00:00 2001 From: xxchan Date: Fri, 3 Jan 2025 18:18:52 +0800 Subject: [PATCH 4/4] fix machete Signed-off-by: xxchan --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ffdc3527..873924c29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,7 +74,7 @@ jobs: with: tool: cargo-machete - name: Cargo Machete - run: make cargo-machete + run: cargo machete build: runs-on: ${{ matrix.os }}