Skip to content

Commit a1c5a52

Browse files
TechassiTechassi
authored
Merge branch 'main' into chore/add-crd-versioning
2 parents dd0dc44 + d0e2d14 commit a1c5a52

27 files changed

+581
-278
lines changed

Diff for: ‎.github/ISSUE_TEMPLATE/release-workspace-members.md

+1
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

Diff for: ‎.github/workflows/build.yml

+27-14
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

Diff for: ‎.github/workflows/daily_security.yml

+5-1
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 }}

Diff for: ‎.github/workflows/pr_pre-commit.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@ on:
77
env:
88
CARGO_TERM_COLOR: always
99
RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
10-
HADOLINT_VERSION: "v1.17.6"
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

Diff for: ‎.github/workflows/publish-docs.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ on:
1313
- crates/**
1414

1515
env:
16-
RUST_TOOLCHAIN_VERSION: "1.82.0"
16+
RUST_TOOLCHAIN_VERSION: "1.84.1"
17+
18+
permissions: {}
1719

1820
jobs:
1921
build-docs:
2022
runs-on: ubuntu-latest
2123
steps:
2224
- name: Checkout Repository
2325
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
26+
with:
27+
persist-credentials: false
2428

2529
- uses: dtolnay/rust-toolchain@master
2630
with:

Diff for: ‎Cargo.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎crates/stackable-operator/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
## [0.87.0] - 2025-02-28
8+
79
### Changed
810

911
- BREAKING: Update `strum` to `0.27.1` (clients need to also update strum!), `rand` to `0.9.0` and `convert_case` to `0.8.0` ([#972]).

Diff for: ‎crates/stackable-operator/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "stackable-operator"
33
description = "Stackable Operator Framework"
4-
version = "0.86.2"
4+
version = "0.87.0"
55
authors.workspace = true
66
license.workspace = true
77
edition.workspace = true

Diff for: ‎crates/stackable-telemetry/CHANGELOG.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,23 @@ All notable changes to this project will be documented in this file.
88

99
### Added
1010

11+
- Allow `Option<_>` to be used to enable/disable a subscriber ([#951]).
1112
- Introduce common `Settings` and subscriber specific settings ([#901]).
1213
- Add support for logging to files ([#933]).
1314

1415
### Changed
1516

16-
- BREAKING: Renamed `TracingBuilder` methods with long names, and prefix with `with_` ([#901]).
17+
- BREAKING: Change subscriber settings into an enum to indicate if the subscriber is enabled/disabled ([#951]).
18+
- BREAKING: Rename `TracingBuilder` methods with long names, and prefix with `with_` ([#901]).
1719
- BREAKING: Use the new subscriber settings in the `TracingBuilder` ([#901]).
1820

21+
### Removed
22+
23+
- BREAKING: Remove `Deref` impls for subscriber settings and removed the `enabled` fields and `enabled()` methods ([#951]).
24+
1925
[#901]: https://github.com/stackabletech/operator-rs/pull/901
2026
[#933]: https://github.com/stackabletech/operator-rs/pull/933
27+
[#951]: https://github.com/stackabletech/operator-rs/pull/951
2128

2229
## [0.2.0] - 2024-07-10
2330

0 commit comments

Comments
 (0)