Skip to content

Commit a7850d4

Browse files
authored
CI has bitrotted and it looks like the new rust 1.90.0 lights up some of our "ui" tests, and I'd prefer to not deal with that, so this also adds a rust-toolchain.toml to set us to 1.89.0
1 parent 938723e commit a7850d4

File tree

4 files changed

+33
-0
lines changed

4 files changed

+33
-0
lines changed

.github/workflows/runas.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ jobs:
8686
cargo --version
8787
pg_config --version
8888
89+
- name: Install rustfmt & clippy
90+
run: |
91+
rustup component add rustfmt
92+
rustup component add clippy
93+
8994
- name: Install cargo pgrx
9095
run: cd cargo-pgrx && cargo install --path . --debug
9196

.github/workflows/tests.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ jobs:
7474
- name: Print sccache stats (before)
7575
run: sccache --show-stats
7676

77+
- name: Install rustfmt & clippy
78+
run: |
79+
rustup component add rustfmt
80+
rustup component add clippy
81+
7782
- name: Run rustfmt
7883
run: cargo fmt --all -- --check
7984

@@ -219,6 +224,11 @@ jobs:
219224
- name: Print sccache stats (before run)
220225
run: sccache --show-stats
221226

227+
- name: Install rustfmt & clippy
228+
run: |
229+
rustup component add rustfmt
230+
rustup component add clippy
231+
222232
- name: Install cargo-pgrx
223233
run: cargo install --path cargo-pgrx/ --debug --force
224234

@@ -374,6 +384,11 @@ jobs:
374384
- name: Print sccache stats (before)
375385
run: sccache --show-stats
376386

387+
- name: Install rustfmt & clippy
388+
run: |
389+
rustup component add rustfmt
390+
rustup component add clippy
391+
377392
- name: Install cargo-pgrx
378393
run: cargo install --path cargo-pgrx/ --debug --force
379394

@@ -495,6 +510,11 @@ jobs:
495510
- name: Print sccache stats
496511
run: sccache --show-stats
497512

513+
- name: Install rustfmt & clippy
514+
run: |
515+
rustup component add rustfmt
516+
rustup component add clippy
517+
498518
- name: Install cargo-pgrx
499519
run: cargo install --path cargo-pgrx/ --debug --force
500520

@@ -575,6 +595,11 @@ jobs:
575595
- name: Install cargo-pgrx
576596
run: cargo install --path cargo-pgrx/ --debug --force
577597

598+
- name: Install rustfmt & clippy
599+
run: |
600+
rustup component add rustfmt
601+
rustup component add clippy
602+
578603
- name: Print sccache stats
579604
run: sccache --show-stats
580605

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust-toolchain.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[toolchain]
2+
channel = "1.89.0"

0 commit comments

Comments
 (0)