Skip to content

Commit eceea4f

Browse files
committed
merge main
2 parents e6a5d69 + a011f92 commit eceea4f

14 files changed

Lines changed: 1118 additions & 140 deletions

File tree

.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ on:
2323

2424
env:
2525
OPERATOR_NAME: "nifi-operator"
26-
RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2025-10-23"
27-
NIX_PKG_MANAGER_VERSION: "2.30.0"
28-
RUST_TOOLCHAIN_VERSION: "1.89.0"
26+
RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2026-02-24"
27+
NIX_PKG_MANAGER_VERSION: "2.33.3"
28+
RUST_TOOLCHAIN_VERSION: "1.93.0"
2929
HADOLINT_VERSION: "v2.14.0"
3030
PYTHON_VERSION: "3.14"
3131
CARGO_TERM_COLOR: always
@@ -139,7 +139,7 @@ jobs:
139139
set -euo pipefail
140140
[ -n "$GITHUB_DEBUG" ] && set -x
141141
142-
CURRENT_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
142+
CURRENT_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "stackable-nifi-operator") | .version')
143143
144144
if [ "$GITHUB_EVENT_NAME" == 'pull_request' ]; then
145145
# Include a PR suffix if this workflow is triggered by a PR

.github/workflows/pr_pre-commit.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77

88
env:
99
CARGO_TERM_COLOR: always
10-
NIX_PKG_MANAGER_VERSION: "2.30.0"
11-
RUST_TOOLCHAIN_VERSION: "nightly-2025-10-23"
10+
NIX_PKG_MANAGER_VERSION: "2.33.3"
11+
RUST_TOOLCHAIN_VERSION: "nightly-2026-02-24"
1212
HADOLINT_VERSION: "v2.14.0"
1313
PYTHON_VERSION: "3.14"
14-
JINJA2_CLI_VERSION: "0.8.2"
14+
JINJA2_CLI_VERSION: "1.0.0"
1515

1616
jobs:
1717
pre-commit:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ repos:
105105
- id: cargo-rustfmt
106106
name: cargo-rustfmt
107107
language: system
108-
entry: cargo +nightly-2025-10-23 fmt --all -- --check
108+
entry: cargo +nightly-2026-02-24 fmt --all -- --check
109109
stages: [pre-commit, pre-merge-commit]
110110
pass_filenames: false
111111
files: \.rs$

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"rust-analyzer.rustfmt.overrideCommand": [
33
"rustfmt",
4-
"+nightly-2025-10-23",
4+
"+nightly-2026-02-24",
55
"--edition",
66
"2024",
77
"--"

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
1515

1616
### Changed
1717

18+
- Bump stackable-operator to 0.106.2 and strum to 0.28 ([#906]).
1819
- Gracefully shutdown all concurrent tasks by forwarding the SIGTERM signal ([#894]).
1920
- BREAKING: Reworked authorization config to closer match the Apache NiFi internal authorizer interfaces ([#884]).
2021

@@ -37,6 +38,7 @@ All notable changes to this project will be documented in this file.
3738
[#894]: https://github.com/stackabletech/nifi-operator/pull/894
3839
[#898]: https://github.com/stackabletech/nifi-operator/pull/898
3940
[#903]: https://github.com/stackabletech/nifi-operator/pull/903
41+
[#906]: https://github.com/stackabletech/nifi-operator/pull/906
4042

4143
## [25.11.0] - 2025-11-07
4244

0 commit comments

Comments
 (0)