From 82a15dcc80cf68fbfb9772f09ee1e3a0ed84432b Mon Sep 17 00:00:00 2001 From: "Eric B. Ridge" Date: Thu, 25 Sep 2025 10:19:41 -0400 Subject: [PATCH 1/4] install rustup in CI --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5bd2f57ed3..b85dcb99a9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,6 +74,9 @@ jobs: - name: Print sccache stats (before) run: sccache --show-stats + - name: Install rustfmt + run: rustup component add rustfmt + - name: Run rustfmt run: cargo fmt --all -- --check From c5cde4eff8a07b00c4ecd57bfd8a44bdbb5c69b9 Mon Sep 17 00:00:00 2001 From: "Eric B. Ridge" Date: Thu, 25 Sep 2025 10:33:13 -0400 Subject: [PATCH 2/4] install clippy in CI --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b85dcb99a9..ab4210bef1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -77,6 +77,9 @@ jobs: - name: Install rustfmt run: rustup component add rustfmt + - name: Install clippy + run: rustup component add clippy + - name: Run rustfmt run: cargo fmt --all -- --check From 44ef2b3734741c40ad33f14759cbe36335eb7157 Mon Sep 17 00:00:00 2001 From: "Eric B. Ridge" Date: Thu, 25 Sep 2025 11:17:03 -0400 Subject: [PATCH 3/4] still trying to fix CI --- .github/workflows/runas.yml | 5 +++++ .github/workflows/tests.yml | 29 ++++++++++++++++++++++++----- Cargo.lock | 1 + 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/.github/workflows/runas.yml b/.github/workflows/runas.yml index 5279338552..a3f7aa7763 100644 --- a/.github/workflows/runas.yml +++ b/.github/workflows/runas.yml @@ -86,6 +86,11 @@ jobs: cargo --version pg_config --version + - name: Install rustfmt & clippy + run: | + rustup component add rustfmt + rustup component add clippy + - name: Install cargo pgrx run: cd cargo-pgrx && cargo install --path . --debug diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ab4210bef1..4c47e50de0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,11 +74,10 @@ jobs: - name: Print sccache stats (before) run: sccache --show-stats - - name: Install rustfmt - run: rustup component add rustfmt - - - name: Install clippy - run: rustup component add clippy + - name: Install rustfmt & clippy + run: | + rustup component add rustfmt + rustup component add clippy - name: Run rustfmt run: cargo fmt --all -- --check @@ -225,6 +224,11 @@ jobs: - name: Print sccache stats (before run) run: sccache --show-stats + - name: Install rustfmt & clippy + run: | + rustup component add rustfmt + rustup component add clippy + - name: Install cargo-pgrx run: cargo install --path cargo-pgrx/ --debug --force @@ -380,6 +384,11 @@ jobs: - name: Print sccache stats (before) run: sccache --show-stats + - name: Install rustfmt & clippy + run: | + rustup component add rustfmt + rustup component add clippy + - name: Install cargo-pgrx run: cargo install --path cargo-pgrx/ --debug --force @@ -501,6 +510,11 @@ jobs: - name: Print sccache stats run: sccache --show-stats + - name: Install rustfmt & clippy + run: | + rustup component add rustfmt + rustup component add clippy + - name: Install cargo-pgrx run: cargo install --path cargo-pgrx/ --debug --force @@ -581,6 +595,11 @@ jobs: - name: Install cargo-pgrx run: cargo install --path cargo-pgrx/ --debug --force + - name: Install rustfmt & clippy + run: | + rustup component add rustfmt + rustup component add clippy + - name: Print sccache stats run: sccache --show-stats diff --git a/Cargo.lock b/Cargo.lock index 03b0801dc6..8569956419 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1934,6 +1934,7 @@ dependencies = [ "bitvec", "enum-map", "libc", + "once_cell", "pgrx-macros", "pgrx-pg-sys", "pgrx-sql-entity-graph", From e0887e9324279adfa6fa5a142d343f0bb0e8a2a5 Mon Sep 17 00:00:00 2001 From: "Eric B. Ridge" Date: Thu, 25 Sep 2025 11:19:14 -0400 Subject: [PATCH 4/4] trying to fix ci and set rust toolchain 1.89.0 --- rust-toolchain.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000..b67e7d5348 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.89.0"