Skip to content

Commit 77d14bc

Browse files
committed
Update pre-commit hooks for docs and clippy runs.
Signed-off-by: Gerd Zellweger <mail@gerdzellweger.com>
1 parent 11c0e22 commit 77d14bc

12 files changed

+54
-32
lines changed

.github/workflows/build-java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Build Compiler
99
runs-on: [self-hosted, skylake40]
1010
container:
11-
image: ghcr.io/feldera/feldera-dev:sha-16392983db90d797040b46489b56399895516720
11+
image: ghcr.io/feldera/feldera-dev:sha-80e0a01ee5dc094fd8693d29338d2836852dff1d
1212
options: --user=ubuntu
1313
steps:
1414
- name: Checkout repository

.github/workflows/build-rust.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ${{ matrix.runner }}
2828

2929
container:
30-
image: ghcr.io/feldera/feldera-dev:sha-16392983db90d797040b46489b56399895516720
30+
image: ghcr.io/feldera/feldera-dev:sha-80e0a01ee5dc094fd8693d29338d2836852dff1d
3131
options: --user=ubuntu
3232
volumes:
3333
- /sccache:/sccache
@@ -40,6 +40,10 @@ jobs:
4040
run: |
4141
cargo build ${{ env.CARGO_FLAGS }} --target=${{ matrix.target }}
4242
43+
# Thanks to rust cargo non-sense it's too hard to split this into separate build and test jobs
44+
- name: Run Rust doc tests
45+
run: cargo test --locked --doc --workspace
46+
4347
- name: Print sccache stats
4448
run: |
4549
sccache --show-stats

.github/workflows/ci-post-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
adjust-versions:
2222
runs-on: [self-hosted, skylake40]
2323
container:
24-
image: ghcr.io/feldera/feldera-dev:sha-16392983db90d797040b46489b56399895516720
24+
image: ghcr.io/feldera/feldera-dev:sha-80e0a01ee5dc094fd8693d29338d2836852dff1d
2525
options: --user=ubuntu
2626
volumes:
2727
- /sccache:/sccache

.github/workflows/ci-pre-mergequeue.yml

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,42 @@ name: Pre Merge Queue Tasks
33
on:
44
pull_request:
55
types: [opened, synchronize]
6+
7+
env:
8+
RUSTC_WRAPPER: sccache
9+
SCCACHE_DIR: /sccache
10+
SCCACHE_CACHE_SIZE: 512G
11+
12+
permissions:
13+
contents: write
14+
615
jobs:
716
# This job needs to be called main (the same as the ci.yml workflow)
817
# because of how merge queues work: https://stackoverflow.com/a/78030618
918
main:
10-
runs-on: ubuntu-latest
19+
container:
20+
image: ghcr.io/feldera/feldera-dev:sha-80e0a01ee5dc094fd8693d29338d2836852dff1d
21+
options: --user=ubuntu
22+
volumes:
23+
- /sccache:/sccache
24+
runs-on: [self-hosted]
1125
steps:
12-
# Required by librdkafka.
13-
- name: Install libsasl2-dev
14-
run: |
15-
sudo apt-get update
16-
sudo apt-get install -y libsasl2-dev
17-
- uses: actions/checkout@v3
18-
- uses: oven-sh/setup-bun@v2
19-
- uses: actions-rust-lang/setup-rust-toolchain@v1
26+
- uses: actions/checkout@v4
2027
with:
21-
toolchain: 1.87.0
22-
components: rustfmt clippy
23-
- uses: actions/setup-python@v4
28+
token: ${{ secrets.CI_RELEASE }}
29+
- uses: actions/cache@v4
2430
with:
25-
python-version: 3.x
26-
- name: Install cargo-machete
27-
uses: clechasseur/rs-cargo@v2
28-
with:
29-
command: install
30-
args: cargo-machete@0.7.0
31-
- uses: Swatinem/rust-cache@v2
32-
- uses: pre-commit/action@v3.0.1
33-
- uses: pre-commit-ci/lite-action@v1.1.0
31+
path: ~/.cache/pre-commit
32+
key: pre-commit-3|${{ hashFiles('.pre-commit-config.yaml') }}
33+
- run: pre-commit run --show-diff-on-failure --color=always --all-files
34+
shell: bash
35+
- name: Print sccache stats
36+
run: sccache --show-stats
37+
- uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403
3438
if: always()
39+
with:
40+
commit_message: "[ci] apply automatic fixes"
41+
commit_user_name: feldera-bot
42+
commit_user_email: feldera-bot@feldera.com
43+
commit_author: feldera-bot <feldera-bot@feldera.com>
44+
commit_options: "--no-verify --signoff"

.github/workflows/publish-crates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
deploy:
1212
runs-on: [self-hosted, skylake40]
1313
container:
14-
image: ghcr.io/feldera/feldera-dev:sha-16392983db90d797040b46489b56399895516720
14+
image: ghcr.io/feldera/feldera-dev:sha-80e0a01ee5dc094fd8693d29338d2836852dff1d
1515
options: --user=ubuntu
1616
volumes:
1717
- /sccache:/sccache

.github/workflows/test-adapters.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# because while it finds redis on the docker network it doesn't find
2222
# redpanda or pubsub (wtf?)
2323
#container:
24-
# image: ghcr.io/feldera/feldera-dev:sha-16392983db90d797040b46489b56399895516720
24+
# image: ghcr.io/feldera/feldera-dev:sha-80e0a01ee5dc094fd8693d29338d2836852dff1d
2525
# options: --user=ubuntu
2626
services:
2727
postgres:

.github/workflows/test-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
runs-on: ${{ matrix.runner }}
6161

6262
container:
63-
image: ghcr.io/feldera/feldera-dev:sha-16392983db90d797040b46489b56399895516720
63+
image: ghcr.io/feldera/feldera-dev:sha-80e0a01ee5dc094fd8693d29338d2836852dff1d
6464
services:
6565
pipeline-manager:
6666
image: ${{ vars.FELDERA_IMAGE_NAME }}:sha-${{ github.sha }}

.github/workflows/test-java-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ${{ matrix.runner }}
2020

2121
container:
22-
image: ghcr.io/feldera/feldera-dev:sha-16392983db90d797040b46489b56399895516720
22+
image: ghcr.io/feldera/feldera-dev:sha-80e0a01ee5dc094fd8693d29338d2836852dff1d
2323
options: --user=ubuntu
2424
steps:
2525
- name: Checkout repository

.github/workflows/test-java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ${{ matrix.runner }}
1515

1616
container:
17-
image: ghcr.io/feldera/feldera-dev:sha-16392983db90d797040b46489b56399895516720
17+
image: ghcr.io/feldera/feldera-dev:sha-80e0a01ee5dc094fd8693d29338d2836852dff1d
1818
options: --user=ubuntu
1919
steps:
2020
- name: Checkout repository

.github/workflows/test-unit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ${{ matrix.runner }}
2323

2424
container:
25-
image: ghcr.io/feldera/feldera-dev:sha-16392983db90d797040b46489b56399895516720
25+
image: ghcr.io/feldera/feldera-dev:sha-80e0a01ee5dc094fd8693d29338d2836852dff1d
2626
options: --user=ubuntu
2727

2828
steps:

0 commit comments

Comments
 (0)