Skip to content

Commit 823ecb2

Browse files
ci: Harden workflows (#979)
* chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@0c1421a Reference-to: stackabletech/operator-templating@0c1421a (Part of stackabletech/internal-issues#175) * ci: Fix env var interpolation --------- Co-authored-by: Techassi <git@techassi.dev>
1 parent 9d7a8aa commit 823ecb2

5 files changed

Lines changed: 15 additions & 8 deletions

File tree

.github/workflows/build.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@ jobs:
8383
submodules: recursive
8484

8585
- name: Install Rust ${{ env.RUST_TOOLCHAIN_VERSION }} toolchain
86-
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
87-
with:
88-
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
86+
shell: bash
87+
run: rustup toolchain install "${RUST_TOOLCHAIN_VERSION}"
8988

9089
- name: Setup Rust Cache
9190
uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -160,9 +159,8 @@ jobs:
160159
uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31.5.2
161160

162161
- name: Install Rust ${{ env.RUST_TOOLCHAIN_VERSION }} Toolchain
163-
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
164-
with:
165-
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
162+
shell: bash
163+
run: rustup toolchain install "${RUST_TOOLCHAIN_VERSION}"
166164

167165
- name: Build Container Image
168166
id: build

.github/workflows/integration-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ on:
2323
test:
2424
description: Name of the test. Only used of test-mode is `custom`
2525

26+
permissions: {}
27+
2628
jobs:
2729
test:
2830
name: Run Integration Test

.github/workflows/pr_prek.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ on:
55
pull_request:
66
merge_group:
77

8+
permissions: {}
9+
810
env:
911
CARGO_TERM_COLOR: always
1012
NIX_PKG_MANAGER_VERSION: "2.33.3"
1113
RUST_TOOLCHAIN_VERSION: "nightly-2026-02-24"
1214
HADOLINT_VERSION: "v2.14.0"
13-
PYTHON_VERSION: "3.14"
1415
JINJA2_CLI_VERSION: "1.0.0"
1516

1617
jobs:
@@ -29,7 +30,6 @@ jobs:
2930
fetch-depth: 0
3031
- uses: stackabletech/actions/run-prek@a14cbd08d9e034e2361ea9205b32aff0491885db # v0.15.0
3132
with:
32-
python-version: ${{ env.PYTHON_VERSION }}
3333
rust: ${{ env.RUST_TOOLCHAIN_VERSION }}
3434
hadolint: ${{ env.HADOLINT_VERSION }}
3535
nix: ${{ env.NIX_PKG_MANAGER_VERSION }}

.pre-commit-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ repos:
3838
hooks:
3939
- id: shellcheck
4040
args: ["--severity=info"]
41+
# Temporarily needed until all getting_started.sh.j2 scripts are made non-executable.
42+
# As long as they are, prek will treat them as shell scripts and so this hook will fail.
43+
# pre-commit behaves differently apparently and doesn't pass .j2 files to this hook.
44+
exclude: \.j2$
4145

4246
# WARNING (@NickLarsenNZ): Nix users need to install ruff first.
4347
# If you do not, you will need to delete the cached ruff binary shown in the

scripts/docs_templating.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,7 @@ do
3838
jinja2 "$file" "$templating_vars_file" -o "$new_file_name"
3939
done
4040

41+
# Ensure this script is executable
42+
chmod +x docs/modules/opensearch/examples/getting_started/getting_started.sh
43+
4144
echo "done"

0 commit comments

Comments
 (0)