Skip to content

Commit df1f6b1

Browse files
committed
chore: Merge branch 'main' into chore/deprecate-initialize-logging
2 parents 2c551ee + 5b417a5 commit df1f6b1

File tree

125 files changed

+2355
-901
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+2355
-901
lines changed

.github/ISSUE_TEMPLATE/release-workspace-members.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Replace the items in the task lists below with the applicable Pull Requests
3939
2. Adjust the version `RUST_TOOLCHAIN_VERSION` in the workflows:
4040
- `.github/workflows/build.yml`
4141
- `.github/workflows/pre_commit.yaml`
42+
- `.github/workflows/publish-docs.yaml`
4243
3. Add a changelog entry.
4344
4. Update any actions (using the Git commit hash) in the workflows. Hint: Also
4445
make sure that the `cargo-udeps` action is up-to-date, otherwise the CI might

.github/workflows/build.yml

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ env:
1717
CARGO_TERM_COLOR: always
1818
CARGO_INCREMENTAL: '0'
1919
CARGO_PROFILE_DEV_DEBUG: '0'
20-
RUST_TOOLCHAIN_VERSION: "1.82.0"
20+
RUST_TOOLCHAIN_VERSION: "1.84.1"
2121
RUSTFLAGS: "-D warnings"
2222
RUSTDOCFLAGS: "-D warnings"
2323
RUST_LOG: "info"
2424

25+
permissions: {}
26+
2527
jobs:
2628
# Identify unused dependencies
2729
run_udeps:
@@ -30,14 +32,16 @@ jobs:
3032
env:
3133
RUSTC_BOOTSTRAP: 1
3234
steps:
33-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
35+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
with:
37+
persist-credentials: false
3438
- uses: dtolnay/rust-toolchain@master
3539
with:
3640
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
37-
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
41+
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
3842
with:
3943
key: udeps
40-
- run: cargo install --locked [email protected].50
44+
- run: cargo install --locked [email protected].55
4145
- run: cargo udeps --all-targets --all-features
4246

4347
run_cargodeny:
@@ -53,21 +57,25 @@ jobs:
5357
continue-on-error: ${{ matrix.checks == 'advisories' }}
5458

5559
steps:
56-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
57-
- uses: EmbarkStudios/cargo-deny-action@3f4a782664881cf5725d0ffd23969fcce89fd868 # v1.6.3
60+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
61+
with:
62+
persist-credentials: false
63+
- uses: EmbarkStudios/cargo-deny-action@4de59db63a066737e557c2c4dd3d1f70206de781 # v2.0.10
5864
with:
5965
command: check ${{ matrix.checks }}
6066

6167
run_rustfmt:
6268
name: Run Rustfmt
6369
runs-on: ubuntu-latest
6470
steps:
65-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
71+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
72+
with:
73+
persist-credentials: false
6674
- uses: dtolnay/rust-toolchain@master
6775
with:
6876
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
6977
components: rustfmt
70-
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
78+
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
7179
with:
7280
key: fmt
7381
- run: cargo fmt --all -- --check
@@ -80,14 +88,15 @@ jobs:
8088
run: |
8189
sudo apt-get update
8290
sudo apt-get install protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
83-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
91+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8492
with:
93+
persist-credentials: false
8594
submodules: recursive
8695
- uses: dtolnay/rust-toolchain@master
8796
with:
8897
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
8998
components: clippy
90-
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
99+
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
91100
with:
92101
key: clippy
93102
- name: Run clippy action to produce annotations
@@ -112,12 +121,14 @@ jobs:
112121
name: Run RustDoc
113122
runs-on: ubuntu-latest
114123
steps:
115-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
124+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
125+
with:
126+
persist-credentials: false
116127
- uses: dtolnay/rust-toolchain@master
117128
with:
118129
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
119130
components: rustfmt
120-
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
131+
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
121132
with:
122133
key: doc
123134
- run: cargo doc --document-private-items
@@ -130,15 +141,17 @@ jobs:
130141
- run_rustdoc
131142
runs-on: ubuntu-latest
132143
steps:
133-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
144+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
145+
with:
146+
persist-credentials: false
134147
- uses: dtolnay/rust-toolchain@master
135148
with:
136149
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
137150
# rust-src is required for trybuild stderr output comparison to work
138151
# for our cases.
139152
# See: https://github.com/dtolnay/trybuild/issues/236#issuecomment-1620950759
140153
components: rust-src
141-
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
154+
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
142155
with:
143156
key: test
144157
- run: cargo test --all-features

.github/workflows/daily_security.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@ on:
66
- cron: '15 4 * * *'
77
workflow_dispatch:
88

9+
permissions: {}
10+
911
jobs:
1012
audit:
1113
runs-on: ubuntu-latest
1214
steps:
13-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
with:
17+
persist-credentials: false
1418
- uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0
1519
with:
1620
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr_pre-commit.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@ on:
66

77
env:
88
CARGO_TERM_COLOR: always
9-
RUST_TOOLCHAIN_VERSION: "1.82.0"
10-
HADOLINT_VERSION: "v1.17.6"
9+
RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
10+
11+
permissions: {}
1112

1213
jobs:
1314
pre-commit:
1415
runs-on: ubuntu-latest
1516
steps:
16-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
17+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1718
with:
19+
persist-credentials: false
1820
fetch-depth: 0
19-
- uses: stackabletech/actions/run-pre-commit@9bd13255f286e4b7a654617268abe1b2f37c3e0a # v0.3.0
21+
- uses: stackabletech/actions/run-pre-commit@2d3d7ddad981ae09901d45a0f6bf30c2658b1b78 # v0.7.0
2022
with:
2123
rust: ${{ env.RUST_TOOLCHAIN_VERSION }}
2224
# rust-src is required for trybuild stderr output comparison to work

.github/workflows/publish-docs.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
name: Publish Crate Docs
3+
4+
# Once the `preview` input is available, this can also run on PR when docs are
5+
# changed.
6+
7+
on:
8+
push:
9+
branches:
10+
- main
11+
paths:
12+
- .github/workflows/publish-docs.yml
13+
- crates/**
14+
15+
env:
16+
RUST_TOOLCHAIN_VERSION: "1.84.1"
17+
18+
permissions: {}
19+
20+
jobs:
21+
build-docs:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Checkout Repository
25+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
26+
with:
27+
persist-credentials: false
28+
29+
- uses: dtolnay/rust-toolchain@master
30+
with:
31+
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
32+
33+
- name: Build Crate Docs
34+
run: cargo doc --no-deps --all-features
35+
36+
- name: Add Redirect
37+
run: echo '<meta http-equiv="refresh" content="0;url=stackable_operator/index.html">' > target/doc/index.html
38+
39+
- name: Upload Documentation Artifacts
40+
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa #v3.0.1
41+
with:
42+
path: target/doc
43+
44+
publish-docs:
45+
runs-on: ubuntu-latest
46+
needs: build-docs
47+
permissions:
48+
pages: write
49+
id-token: write
50+
environment:
51+
name: github-pages
52+
url: ${{ steps.deploy.outputs.page_url }}
53+
steps:
54+
- name: Deploy to Github Pages
55+
id: deploy
56+
uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5

.pre-commit-config.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ repos:
1515
- repo: https://github.com/doublify/pre-commit-rust
1616
rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
1717
hooks:
18-
- id: fmt
19-
args: ["--all", "--", "--check"]
2018
- id: clippy
2119
args: ["--all-targets", "--", "-D", "warnings"]
2220
- repo: https://github.com/adrienverge/yamllint
@@ -53,3 +51,11 @@ repos:
5351
entry: .scripts/verify_crate_versions.sh
5452
stages: [pre-commit, pre-merge-commit, manual]
5553
pass_filenames: false
54+
55+
- id: rustfmt
56+
name: rustfmt
57+
language: system
58+
# Pinning to a specific rustc version, so that we get consistent formatting
59+
entry: cargo +nightly-2025-01-15 fmt --all -- --check
60+
stages: [pre-commit]
61+
pass_filenames: false

0 commit comments

Comments
 (0)