From ee7cabda16ce4cd3180cf718d7fe5cb60eb1d1d5 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Mon, 30 Mar 2026 09:33:17 +0000 Subject: [PATCH 1/2] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@2428552dc3a822ace7e57f2eae68433be7a5fa5e Reference-to: stackabletech/operator-templating@2428552 (Rollout CI fixes for external contributions on forks) --- .github/workflows/build.yaml | 36 ++++++++++++++++++-------- .github/workflows/integration-test.yml | 4 +-- .github/workflows/pr_pre-commit.yaml | 2 +- docker/Dockerfile | 2 +- rustfmt.toml | 2 +- 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 336874fc..e9dc2ebe 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,7 +48,7 @@ jobs: - name: Check for changed files id: check - uses: stackabletech/actions/detect-changes@babe44d7b1db87f8e7731c011151d22a8a374191 # v0.12.0 + uses: stackabletech/actions/detect-changes@9848c5593dff4793aacba240116a648c02f20fa4 # v0.13.1 with: patterns: | - '.github/workflows/build.yaml' @@ -166,7 +166,7 @@ jobs: - name: Build Container Image id: build - uses: stackabletech/actions/build-container-image@babe44d7b1db87f8e7731c011151d22a8a374191 # v0.12.0 + uses: stackabletech/actions/build-container-image@9848c5593dff4793aacba240116a648c02f20fa4 # v0.13.1 with: image-name: ${{ env.OPERATOR_NAME }} image-index-manifest-tag: ${{ steps.version.outputs.OPERATOR_VERSION }} @@ -174,7 +174,8 @@ jobs: container-file: docker/Dockerfile - name: Publish Container Image - uses: stackabletech/actions/publish-image@babe44d7b1db87f8e7731c011151d22a8a374191 # v0.12.0 + if: ${{ !github.event.pull_request.head.repo.fork }} + uses: stackabletech/actions/publish-image@9848c5593dff4793aacba240116a648c02f20fa4 # v0.13.1 with: image-registry-uri: oci.stackable.tech image-registry-username: robot$sdp+github-action-build @@ -185,7 +186,10 @@ jobs: publish-index-manifest: name: Publish/Sign ${{ needs.build-container-image.outputs.operator-version }} Index - if: (github.event_name != 'merge_group') && needs.detect-changes.outputs.detected == 'true' + if: | + (github.event_name != 'merge_group') + && needs.detect-changes.outputs.detected == 'true' + && !github.event.pull_request.head.repo.fork needs: - detect-changes - build-container-image @@ -199,7 +203,7 @@ jobs: persist-credentials: false - name: Publish and Sign Image Index - uses: stackabletech/actions/publish-image-index-manifest@babe44d7b1db87f8e7731c011151d22a8a374191 # v0.12.0 + uses: stackabletech/actions/publish-image-index-manifest@9848c5593dff4793aacba240116a648c02f20fa4 # v0.13.1 with: image-registry-uri: oci.stackable.tech image-registry-username: robot$sdp+github-action-build @@ -209,7 +213,9 @@ jobs: publish-helm-chart: name: Package/Publish ${{ needs.build-container-image.outputs.operator-version }} Helm Chart - if: (github.event_name != 'merge_group') && needs.detect-changes.outputs.detected == 'true' + if: | + (github.event_name != 'merge_group') + && needs.detect-changes.outputs.detected == 'true' needs: - detect-changes - build-container-image @@ -224,7 +230,7 @@ jobs: submodules: recursive - name: Package, Publish, and Sign Helm Chart - uses: stackabletech/actions/publish-helm-chart@babe44d7b1db87f8e7731c011151d22a8a374191 # v0.12.0 + uses: stackabletech/actions/publish-helm-chart@9848c5593dff4793aacba240116a648c02f20fa4 # v0.13.1 with: chart-registry-uri: oci.stackable.tech chart-registry-username: robot$sdp-charts+github-action-build @@ -233,10 +239,14 @@ jobs: chart-directory: deploy/helm/${{ env.OPERATOR_NAME }} chart-version: ${{ needs.build-container-image.outputs.operator-version }} app-version: ${{ needs.build-container-image.outputs.operator-version }} + publish-and-sign: ${{ !github.event.pull_request.head.repo.fork }} openshift-preflight-check: name: Run OpenShift Preflight Check for ${{ needs.build-container-image.outputs.operator-version }}-${{ matrix.arch }} - if: (github.event_name != 'merge_group') && needs.detect-changes.outputs.detected == 'true' + if: | + (github.event_name != 'merge_group') + && needs.detect-changes.outputs.detected == 'true' + && !github.event.pull_request.head.repo.fork needs: - detect-changes - build-container-image @@ -250,7 +260,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Run OpenShift Preflight Check - uses: stackabletech/actions/run-openshift-preflight@babe44d7b1db87f8e7731c011151d22a8a374191 # v0.12.0 + uses: stackabletech/actions/run-openshift-preflight@9848c5593dff4793aacba240116a648c02f20fa4 # v0.13.1 with: image-index-uri: oci.stackable.tech/sdp/${{ env.OPERATOR_NAME }}:${{ needs.build-container-image.outputs.operator-version }} image-architecture: ${{ matrix.arch }} @@ -272,7 +282,11 @@ jobs: notify: name: Failure Notification - if: (failure() || github.run_attempt > 1) && github.event_name != 'merge_group' && needs.detect-changes.outputs.detected == 'true' + if: | + (failure() || github.run_attempt > 1) + && github.event_name != 'merge_group' + && needs.detect-changes.outputs.detected == 'true' + && !github.event.pull_request.head.repo.fork needs: - detect-changes - build-container-image @@ -286,7 +300,7 @@ jobs: persist-credentials: false - name: Send Notification - uses: stackabletech/actions/send-slack-notification@babe44d7b1db87f8e7731c011151d22a8a374191 # v0.12.0 + uses: stackabletech/actions/send-slack-notification@9848c5593dff4793aacba240116a648c02f20fa4 # v0.13.1 with: publish-helm-chart-result: ${{ needs.publish-helm-chart.result }} publish-manifests-result: ${{ needs.publish-index-manifest.result }} diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 0f9f268e..6ef8c57d 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -41,7 +41,7 @@ jobs: # TODO: Enable the scheduled runs which hard-code what profile to use - name: Run Integration Test id: test - uses: stackabletech/actions/run-integration-test@29bea1b451c0c2e994bd495969286f95bf49ed6a # v0.11.0 + uses: stackabletech/actions/run-integration-test@9848c5593dff4793aacba240116a648c02f20fa4 # v0.13.1 with: replicated-api-token: ${{ secrets.REPLICATED_API_TOKEN }} test-mode-input: ${{ inputs.test-mode-input }} @@ -51,7 +51,7 @@ jobs: - name: Send Notification if: ${{ failure() || github.run_attempt > 1 }} - uses: stackabletech/actions/send-slack-notification@29bea1b451c0c2e994bd495969286f95bf49ed6a # v0.11.0 + uses: stackabletech/actions/send-slack-notification@9848c5593dff4793aacba240116a648c02f20fa4 # v0.13.1 with: slack-token: ${{ secrets.SLACK_INTEGRATION_TEST_TOKEN }} failed-tests: ${{ steps.test.outputs.failed-tests }} diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml index b45e2daf..b096292f 100644 --- a/.github/workflows/pr_pre-commit.yaml +++ b/.github/workflows/pr_pre-commit.yaml @@ -27,7 +27,7 @@ jobs: persist-credentials: false submodules: recursive fetch-depth: 0 - - uses: stackabletech/actions/run-pre-commit@29bea1b451c0c2e994bd495969286f95bf49ed6a # v0.11.0 + - uses: stackabletech/actions/run-pre-commit@9848c5593dff4793aacba240116a648c02f20fa4 # v0.13.1 with: python-version: ${{ env.PYTHON_VERSION }} rust: ${{ env.RUST_TOOLCHAIN_VERSION }} diff --git a/docker/Dockerfile b/docker/Dockerfile index 118e1812..e844d2cc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -37,7 +37,7 @@ ARG STACKABLE_USER_NAME="stackable" # "-c": Allows the execution of commands passed as a string SHELL ["/bin/bash", "-euo", "pipefail", "-c"] -# These labels have mostly been superseded by the OpenContainer spec annotations below but it doesn't hurt to include them +# These labels have mostly been superceded by the OpenContainer spec annotations below but it doesn't hurt to include them # http://label-schema.org/rc1/ LABEL name="Stackable Operator for Trino" LABEL maintainer="info@stackable.tech" diff --git a/rustfmt.toml b/rustfmt.toml index 03d21a4f..07217b21 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,5 +1,5 @@ # This file includes unstable features, so you need to run "cargo +nightly fmt" to format your code. -# It's also ok to use the stable toolchain by simple running "cargo fmt", but using the nightly formatter is preferred. +# It's also ok to use the stable toolchain by simple running "cargo fmt", but using the nigthly formatter is prefered. # https://doc.rust-lang.org/nightly/edition-guide/rust-2024/rustfmt-style-edition.html style_edition = "2024" From 31bf31448fb893316c0108da14e7d3d055fbd97d Mon Sep 17 00:00:00 2001 From: Techassi Date: Mon, 30 Mar 2026 11:46:46 +0200 Subject: [PATCH 2/2] chore: Re-fix typos accidentally reverted by templating These types must be fixed in the templating repo instead. --- docker/Dockerfile | 2 +- rustfmt.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e844d2cc..118e1812 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -37,7 +37,7 @@ ARG STACKABLE_USER_NAME="stackable" # "-c": Allows the execution of commands passed as a string SHELL ["/bin/bash", "-euo", "pipefail", "-c"] -# These labels have mostly been superceded by the OpenContainer spec annotations below but it doesn't hurt to include them +# These labels have mostly been superseded by the OpenContainer spec annotations below but it doesn't hurt to include them # http://label-schema.org/rc1/ LABEL name="Stackable Operator for Trino" LABEL maintainer="info@stackable.tech" diff --git a/rustfmt.toml b/rustfmt.toml index 07217b21..03d21a4f 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,5 +1,5 @@ # This file includes unstable features, so you need to run "cargo +nightly fmt" to format your code. -# It's also ok to use the stable toolchain by simple running "cargo fmt", but using the nigthly formatter is prefered. +# It's also ok to use the stable toolchain by simple running "cargo fmt", but using the nightly formatter is preferred. # https://doc.rust-lang.org/nightly/edition-guide/rust-2024/rustfmt-style-edition.html style_edition = "2024"