diff --git a/.github/ISSUE_TEMPLATE/pre-release.md b/.github/ISSUE_TEMPLATE/pre-release.md index 25ff5935..f3b35b2e 100644 --- a/.github/ISSUE_TEMPLATE/pre-release.md +++ b/.github/ISSUE_TEMPLATE/pre-release.md @@ -44,8 +44,8 @@ Part of - [ ] Update stable Rust toolchain in the `config/versions.yaml` file. - [ ] Update nightly Rust toolchain in the `config/versions.yaml` file (Keep in sync across this, operator-rs and docker-images). -- [ ] Update Rust toolchain in UBI9 and stackable-base images -- [ ] Update cargo-cyclonedx and cargo-auditable in UBI9 and stackable-base images +- [ ] Update Rust toolchain in UBI10 and stackable-base images +- [ ] Update cargo-cyclonedx and cargo-auditable in UBI10 and stackable-base images - [ ] Generate downstream PRs using the ["Generate Downstream PRs"](https://github.com/stackabletech/operator-templating/actions/workflows/generate_prs.yml) action. Use the following title for downstream PRs: `chore(template): Updates for SDP YY.M.X`. - [ ] [Search for PRs](https://github.com/search?q=org%3Astackabletech%20sort%3Aupdated-desc%20is%3Apr%20is%3Aopen%20Update%20templated%20files&type=pullrequests) and add them to the list below. - [ ] Add the `release/YY.M.X` label to the downstream PRs and continue to merge them. See below for more details. @@ -63,7 +63,7 @@ Part of | xargs -I {} echo "- [ ] _PR for {}_" --> -- [ ] _PR for ubi9-rust-builder image_ +- [ ] _PR for ubi10-rust-builder image_ - [ ] _PR for stackable-base image_ - [ ] _PR for airflow-operator_ - [ ] _PR for commons-operator_ diff --git a/.github/workflows/pr_pre-commit.yml b/.github/workflows/pr_pre-commit.yml index 6e66b844..61a98dee 100644 --- a/.github/workflows/pr_pre-commit.yml +++ b/.github/workflows/pr_pre-commit.yml @@ -14,11 +14,11 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false fetch-depth: 0 - - uses: stackabletech/actions/run-pre-commit@29bea1b451c0c2e994bd495969286f95bf49ed6a # v0.11.0 + - uses: stackabletech/actions/run-pre-commit@c34dbb4f27b274736c7d2edc6f6f30a03d03edf5 # v0.12.2 with: python-version: ${{ env.PYTHON_VERSION }} hadolint: ${{ env.HADOLINT_VERSION }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9e790af1..389939e4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - id: detect-private-key - repo: https://github.com/adrienverge/yamllint - rev: 79a6b2b1392eaf49cdd32ac4f14be1a809bbd8f7 # 1.37.1 + rev: cba56bcde1fdd01c1deb3f945e69764c291a6530 # 1.38.0 hooks: - id: yamllint args: ["--strict"] @@ -23,7 +23,7 @@ repos: files: \.(yml|yaml)(\.j2)*$ - repo: https://github.com/igorshubovych/markdownlint-cli - rev: 192ad822316c3a22fb3d3cc8aa6eafa0b8488360 # 0.45.0 + rev: 76b3d32d3f4b965e1d6425253c59407420ae2c43 # 0.47.0 hooks: - id: markdownlint types: [text] @@ -39,7 +39,7 @@ repos: # If you do not, you will need to delete the cached ruff binary shown in the # error message - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 3b4bc031619cde2e0a9f3c4441ac7cc8227245a4 # 0.14.1 + rev: 0839f92796ae388643a08a21640a029b322be5c2 # 0.15.2 hooks: # Run the linter. - id: ruff @@ -47,7 +47,7 @@ repos: - id: ruff-format - repo: https://github.com/rhysd/actionlint - rev: e7d448ef7507c20fc4c88a95d0c448b848cd6127 # 1.7.8 + rev: 393031adb9afb225ee52ae2ccd7a5af5525e03e8 # 1.7.11 hooks: - id: actionlint types: [text] diff --git a/config/versions.yaml b/config/versions.yaml index 4f467198..d9a84906 100644 --- a/config/versions.yaml +++ b/config/versions.yaml @@ -1,13 +1,13 @@ --- # IMPORTANT # If you change the Rust toolchain version here, make sure to also change -# docker-images/ubi9-rust-builder/Dockerfile -rust_version: 1.89.0 +# docker-images/ubi10-rust-builder/Dockerfile +rust_version: 1.93.0 # This nightly version is only used for cargo fmt invocations, because we use nightly-only # rustfmt config options in rustfmt.toml. The version should be kept in line with the version # used in the operator-rs repository. -rust_nightly_version: nightly-2025-10-23 +rust_nightly_version: nightly-2026-02-24 # This edition is mostly used for rustfmt commands and the rustfmt config file. The edition should # be kept in line with the edition in the operator-rs repository. @@ -29,6 +29,7 @@ python_version: 3.14 # https://github.com/NixOS/nix/tags # Usually the latest version should just work and as such the version here can # be bumped without any constraints. -nix_pkg_manager_version: 2.30.0 +nix_pkg_manager_version: 2.33.3 -jinja2_cli_version: 0.8.2 +# Check https://pypi.org/project/jinja2-cli/#history for updates +jinja2_cli_version: 1.0.0 diff --git a/template/nix/sources.json b/template/nix/sources.json index cd1ef311..10cce14f 100644 --- a/template/nix/sources.json +++ b/template/nix/sources.json @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea7f1f06811ce7fcc81d6c6fd4213150c23edcf2", - "sha256": "12q60q50gy65vnkkmn6lhhnh7wzidl9658y52d7digqbf58kwb8p", + "rev": "26eaeac4e409d7b5a6bf6f90a2a2dc223c78d915", + "sha256": "1knl8dcr5ip70a2vbky3q844212crwrvybyw2nhfmgm1mvqry963", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/ea7f1f06811ce7fcc81d6c6fd4213150c23edcf2.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/26eaeac4e409d7b5a6bf6f90a2a2dc223c78d915.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }