From 8d2a189cc8e2bf4503c78aec3b8882582bbb829d Mon Sep 17 00:00:00 2001 From: Karl Rister Date: Tue, 18 Nov 2025 16:02:57 -0600 Subject: [PATCH 1/3] correct the name of the crucible-merged workflow to align with other Crucible subprojects --- .github/workflows/{crucible-merge.yaml => crucible-merged.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{crucible-merge.yaml => crucible-merged.yaml} (100%) diff --git a/.github/workflows/crucible-merge.yaml b/.github/workflows/crucible-merged.yaml similarity index 100% rename from .github/workflows/crucible-merge.yaml rename to .github/workflows/crucible-merged.yaml From e9bfaf63f0ffc632ed12eaa1cd31611a0e9a7c8f Mon Sep 17 00:00:00 2001 From: Karl Rister Date: Tue, 18 Nov 2025 16:04:03 -0600 Subject: [PATCH 2/3] limit the execution of crucible-merged to changes of files that could result in the building of new engine container images --- .github/workflows/crucible-merged.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/crucible-merged.yaml b/.github/workflows/crucible-merged.yaml index 624a2dc..daf70f4 100644 --- a/.github/workflows/crucible-merged.yaml +++ b/.github/workflows/crucible-merged.yaml @@ -4,13 +4,9 @@ on: pull_request_target: types: [ closed ] branches: [ master ] - paths-ignore: - - LICENSE - - '**.md' - - '.github/rulesets/**' - - .github/workflows/run-crucible-tracking.yaml - - .github/workflows/faux-crucible-ci.yaml - - 'docs/**' + paths: + - .github/workflows/crucible-merged.yaml + - workshop.json workflow_dispatch: jobs: From cf94b48903c533e6a8cbcee96b65350bf09e2e36 Mon Sep 17 00:00:00 2001 From: Karl Rister Date: Tue, 18 Nov 2025 16:04:36 -0600 Subject: [PATCH 3/3] update the crucible-merged workflow to have userenv_filter=unique - this minimizes the runtime while ensuring that all userenvs are being processed --- .github/workflows/crucible-merged.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/crucible-merged.yaml b/.github/workflows/crucible-merged.yaml index daf70f4..f29ee81 100644 --- a/.github/workflows/crucible-merged.yaml +++ b/.github/workflows/crucible-merged.yaml @@ -17,6 +17,7 @@ jobs: ci_target: "procstat" ci_target_branch: "master" github_workspace: "$GITHUB_WORKSPACE" + userenv_filter: "unique" secrets: production_registry_auth: ${{ secrets.CRUCIBLE_PRODUCTION_ENGINES_REGISTRY_AUTH }} quay_oauth_token: ${{ secrets.CRUCIBLE_QUAYIO_OAUTH_TOKEN }}