From dbc5b76342295ef66080c927e76d58f93c691ad2 Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Sun, 10 Nov 2024 20:16:25 +0800 Subject: [PATCH 1/5] add merge queue testing --- .github/workflows/lints.yml | 3 ++- .github/workflows/tests.yml | 9 ++++----- rust-utilities/Cargo.lock | 32 ++++++++++++++++++++++++++------ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml index 5c60ed5d7..2b1673525 100644 --- a/.github/workflows/lints.yml +++ b/.github/workflows/lints.yml @@ -1,6 +1,7 @@ name: Lints on: + merge_group: pull_request: branches: - nightly @@ -12,7 +13,7 @@ jobs: ClippyAll: name: Clippy runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v4 - name: Install latest nightly Rust toolchain diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a077750fb..e4a0e0b96 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,12 +1,11 @@ name: Tests on: + merge_group: push: branches: - nightly - stable - - automation/bors/approve - - automation/bors/try env: CARGO_TERM_COLOR: always @@ -15,7 +14,7 @@ jobs: BuildAll: name: Build runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v4 - name: Install latest nightly Rust toolchain @@ -25,7 +24,7 @@ jobs: - name: Install Python 3.11 uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: "3.11" - name: Run Build run: python ./x.py build @@ -44,7 +43,7 @@ jobs: - name: Install Python 3.11 uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: "3.11" - name: Run Build run: python ./x.py build -- discord-frontend - name: Run Tests diff --git a/rust-utilities/Cargo.lock b/rust-utilities/Cargo.lock index 04f198de9..76d250801 100644 --- a/rust-utilities/Cargo.lock +++ b/rust-utilities/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -452,7 +452,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" dependencies = [ - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -622,7 +622,7 @@ name = "hartex_errors" version = "0.13.0" dependencies = [ "miette", - "thiserror", + "thiserror 2.0.0", ] [[package]] @@ -962,7 +962,7 @@ dependencies = [ "libc", "log", "log-mdc", - "thiserror", + "thiserror 1.0.68", "thread-id", "winapi", ] @@ -1001,7 +1001,7 @@ checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" dependencies = [ "cfg-if", "miette-derive", - "thiserror", + "thiserror 1.0.68", "unicode-width", ] @@ -1752,7 +1752,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15291287e9bff1bc6f9ff3409ed9af665bec7a5fc8ac079ea96be07bca0e2668" +dependencies = [ + "thiserror-impl 2.0.0", ] [[package]] @@ -1766,6 +1775,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22efd00f33f93fa62848a7cab956c3d38c8d43095efda1decfc2b3a5dc0b8972" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thread-id" version = "4.2.2" From aa4989d2a59610c40173839b16b6c262c8dd7791 Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Sun, 10 Nov 2024 20:17:27 +0800 Subject: [PATCH 2/5] remove lint merge group --- .github/workflows/lints.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml index 2b1673525..cc32a4202 100644 --- a/.github/workflows/lints.yml +++ b/.github/workflows/lints.yml @@ -1,7 +1,6 @@ name: Lints on: - merge_group: pull_request: branches: - nightly @@ -24,7 +23,7 @@ jobs: - name: Install Python 3.11 uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: "3.11" - name: Run Clippy run: python ./x.py clippy From e175c410f7128eead86c476df787c4434bbf57b4 Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Sun, 10 Nov 2024 20:29:19 +0800 Subject: [PATCH 3/5] try fix --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e4a0e0b96..340f6fd31 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,6 +2,8 @@ name: Tests on: merge_group: + types: + - checks_requested push: branches: - nightly From b1034f4d24114830e504e6320e6ea706f5b1ffa2 Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Sun, 10 Nov 2024 20:38:37 +0800 Subject: [PATCH 4/5] changes --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 340f6fd31..f4cdbe8c2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,6 +15,7 @@ env: jobs: BuildAll: name: Build + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest steps: @@ -34,6 +35,7 @@ jobs: name: Test needs: - BuildAll + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest steps: From f2f4f502f2adb6c2ff23eae6c712993e4f814934 Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Sun, 10 Nov 2024 20:39:46 +0800 Subject: [PATCH 5/5] change --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f4cdbe8c2..884869aae 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,6 +4,7 @@ on: merge_group: types: - checks_requested + pull_request: push: branches: - nightly