From eddbca695520762dd7561ebfaf0bbec5993c08b9 Mon Sep 17 00:00:00 2001
From: mdzurick <mitch_dz@hotmail.com>
Date: Tue, 16 Jun 2026 04:10:26 +0000
Subject: [PATCH 1/2] Suppress unwanted ghcr-ci deployment records in CI

The ghcr-ci environment only gates CI secrets/access and is not a real
deployment, but using it implicitly created a deployment record (and the
"deployed to ghcr-ci" message on PRs). Set deployment: false for ghcr-ci
in the shared dev_environment and docker_images workflows so the record is
never created, while ghcr-deployment and other environments are unaffected.

Signed-off-by: mdzurick <mitch_dz@hotmail.com>
---
 .github/workflows/dev_environment.yml | 2 ++
 .github/workflows/docker_images.yml   | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/dev_environment.yml b/.github/workflows/dev_environment.yml
index ad8e4e927e0..fdd8de768cc 100644
--- a/.github/workflows/dev_environment.yml
+++ b/.github/workflows/dev_environment.yml
@@ -110,6 +110,7 @@ jobs:
     environment:
       name: ${{ inputs.environment || 'default' }}
       url: ${{ vars.deployment_url || format('https://github.com/{0}', github.repository) }}
+      deployment: ${{ inputs.environment != 'ghcr-ci' }}
 
     steps:
       - name: Checkout repository
@@ -213,6 +214,7 @@ jobs:
     environment:
       name: ${{ inputs.environment || 'default' }}
       url: ${{ vars.deployment_url || format('https://github.com/{0}', github.repository) }}
+      deployment: ${{ inputs.environment != 'ghcr-ci' }}
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/docker_images.yml b/.github/workflows/docker_images.yml
index d2540c58584..8cfe61501e4 100644
--- a/.github/workflows/docker_images.yml
+++ b/.github/workflows/docker_images.yml
@@ -55,6 +55,7 @@ jobs:
     environment:
       name: ${{ inputs.environment || 'default' }}
       url: ${{ vars.deployment_url || format('https://github.com/{0}', github.repository) }}
+      deployment: ${{ inputs.environment != 'ghcr-ci' }}
 
     steps:
       - id: info
@@ -98,6 +99,7 @@ jobs:
     environment:
       name: ${{ inputs.environment || 'default' }}
       url: ${{ vars.deployment_url || format('https://github.com/{0}', github.repository) }}
+      deployment: ${{ inputs.environment != 'ghcr-ci' }}
   
     steps:
       - name: Checkout repository
@@ -228,6 +230,7 @@ jobs:
     environment:
       name: ${{ inputs.environment || 'default' }}
       url: ${{ vars.deployment_url || format('https://github.com/{0}', github.repository) }}
+      deployment: ${{ inputs.environment != 'ghcr-ci' }}
 
     # Needed for making local images available to the docker/build-push-action.
     # See also https://stackoverflow.com/a/63927832.
@@ -445,6 +448,7 @@ jobs:
     environment:
       name: ${{ inputs.environment || 'default' }}
       url: ${{ vars.deployment_url || format('https://github.com/{0}', github.repository) }}
+      deployment: ${{ inputs.environment != 'ghcr-ci' }}
 
     # Needed for making local images available to the docker/build-push-action.
     # See also https://stackoverflow.com/a/63927832.

From 1dde3fb4a53ef4823479c4dcd5424f5c395119f2 Mon Sep 17 00:00:00 2001
From: mdzurick <mitch_dz@hotmail.com>
Date: Tue, 16 Jun 2026 17:54:01 +0000
Subject: [PATCH 2/2] Suppress ghcr-deployment records on PR cache-update runs

The pull_request_target cache-update flow runs dev_environment jobs with
environment: ghcr-deployment purely for registry access, passing
update_registry_cache so no image is pushed. That still created a
deployment record (and the "requested a deployment to ghcr-deployment"
messages on PRs) that clean_up does not remove. Only record a deployment
for real pushes, i.e. when update_registry_cache is empty; real deploys
keep deployment: true and stay branch-policy enforced.

Signed-off-by: mdzurick <mitch_dz@hotmail.com>
---
 .github/workflows/dev_environment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev_environment.yml b/.github/workflows/dev_environment.yml
index fdd8de768cc..425029b2b69 100644
--- a/.github/workflows/dev_environment.yml
+++ b/.github/workflows/dev_environment.yml
@@ -110,7 +110,7 @@ jobs:
     environment:
       name: ${{ inputs.environment || 'default' }}
       url: ${{ vars.deployment_url || format('https://github.com/{0}', github.repository) }}
-      deployment: ${{ inputs.environment != 'ghcr-ci' }}
+      deployment: ${{ inputs.environment != 'ghcr-ci' && inputs.update_registry_cache == '' }}
 
     steps:
       - name: Checkout repository
@@ -214,7 +214,7 @@ jobs:
     environment:
       name: ${{ inputs.environment || 'default' }}
       url: ${{ vars.deployment_url || format('https://github.com/{0}', github.repository) }}
-      deployment: ${{ inputs.environment != 'ghcr-ci' }}
+      deployment: ${{ inputs.environment != 'ghcr-ci' && inputs.update_registry_cache == '' }}
 
     steps:
       - name: Checkout repository