From e30b021e0adb70697367fed9a37c414fd711cf3a Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Fri, 26 Jun 2026 08:21:18 +0000 Subject: [PATCH 1/2] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@0c1421a8f76ce80a7ee47a92cef531a6edcaeccd Reference-to: stackabletech/operator-templating@0c1421a (Part of https://github.com/stackabletech/internal-issues/issues/175) --- .github/workflows/build.yaml | 10 ++++------ .github/workflows/integration-test.yml | 2 ++ .github/workflows/pr_prek.yaml | 4 ++-- .pre-commit-config.yaml | 4 ++++ scripts/docs_templating.sh | 3 +++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 94546fbe..899fbdc6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -83,9 +83,8 @@ jobs: submodules: recursive - name: Install Rust ${{ env.RUST_TOOLCHAIN_VERSION }} toolchain - uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b - with: - toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} + shell: bash + run: rustup toolchain install "RUST_TOOLCHAIN_VERSION" - name: Setup Rust Cache uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 @@ -160,9 +159,8 @@ jobs: uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2 - name: Install Rust ${{ env.RUST_TOOLCHAIN_VERSION }} Toolchain - uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b - with: - toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} + shell: bash + run: rustup toolchain install "RUST_TOOLCHAIN_VERSION" - name: Build Container Image id: build diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 884d81a0..18c3e308 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -23,6 +23,8 @@ on: test: description: Name of the test. Only used of test-mode is `custom` +permissions: {} + jobs: test: name: Run Integration Test diff --git a/.github/workflows/pr_prek.yaml b/.github/workflows/pr_prek.yaml index 3e9aeef1..0aeb65bb 100644 --- a/.github/workflows/pr_prek.yaml +++ b/.github/workflows/pr_prek.yaml @@ -5,12 +5,13 @@ on: pull_request: merge_group: +permissions: {} + env: CARGO_TERM_COLOR: always NIX_PKG_MANAGER_VERSION: "2.33.3" RUST_TOOLCHAIN_VERSION: "nightly-2026-02-24" HADOLINT_VERSION: "v2.14.0" - PYTHON_VERSION: "3.14" JINJA2_CLI_VERSION: "1.0.0" jobs: @@ -29,7 +30,6 @@ jobs: fetch-depth: 0 - uses: stackabletech/actions/run-prek@a14cbd08d9e034e2361ea9205b32aff0491885db # v0.15.0 with: - python-version: ${{ env.PYTHON_VERSION }} rust: ${{ env.RUST_TOOLCHAIN_VERSION }} hadolint: ${{ env.HADOLINT_VERSION }} nix: ${{ env.NIX_PKG_MANAGER_VERSION }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4d8e96c3..0a689b7b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,6 +38,10 @@ repos: hooks: - id: shellcheck args: ["--severity=info"] + # Temporarily needed until all getting_started.sh.j2 scripts are made non-executable. + # As long as they are, prek will treat them as shell scripts and so this hook will fail. + # pre-commit behaves differently apparently and doesn't pass .j2 files to this hook. + exclude: \.j2$ # WARNING (@NickLarsenNZ): Nix users need to install ruff first. # If you do not, you will need to delete the cached ruff binary shown in the diff --git a/scripts/docs_templating.sh b/scripts/docs_templating.sh index e4b945da..8468a971 100755 --- a/scripts/docs_templating.sh +++ b/scripts/docs_templating.sh @@ -38,4 +38,7 @@ do jinja2 "$file" "$templating_vars_file" -o "$new_file_name" done +# Ensure this script is executable +chmod +x docs/modules/opensearch/examples/getting_started/getting_started.sh + echo "done" From 78bb5a10c63fe8467b0097c9713f2290701213bc Mon Sep 17 00:00:00 2001 From: Techassi Date: Fri, 26 Jun 2026 10:35:19 +0200 Subject: [PATCH 2/2] ci: Fix env var interpolation --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 899fbdc6..9f8446e0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -84,7 +84,7 @@ jobs: - name: Install Rust ${{ env.RUST_TOOLCHAIN_VERSION }} toolchain shell: bash - run: rustup toolchain install "RUST_TOOLCHAIN_VERSION" + run: rustup toolchain install "${RUST_TOOLCHAIN_VERSION}" - name: Setup Rust Cache uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 @@ -160,7 +160,7 @@ jobs: - name: Install Rust ${{ env.RUST_TOOLCHAIN_VERSION }} Toolchain shell: bash - run: rustup toolchain install "RUST_TOOLCHAIN_VERSION" + run: rustup toolchain install "${RUST_TOOLCHAIN_VERSION}" - name: Build Container Image id: build