From e2d12f43cc50addeed4d8d542e7e309131fe6789 Mon Sep 17 00:00:00 2001 From: sean wibisono Date: Mon, 20 Apr 2026 15:15:31 +1000 Subject: [PATCH 1/2] use ci-auto-merge in Release Admin Image workflow --- .github/workflows/release-docker-image.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-docker-image.yaml b/.github/workflows/release-docker-image.yaml index 4b5d4a694..5f81dec9d 100644 --- a/.github/workflows/release-docker-image.yaml +++ b/.github/workflows/release-docker-image.yaml @@ -26,4 +26,5 @@ jobs: release_type: ${{ inputs.release_type }} vulnerability_severity: ${{ inputs.vulnerability_severity }} java_version: 21 + merge_environment: 'ci-auto-merge' secrets: inherit From 0204f9c6f8799cca9f16e3e59bf4dfa613b91ad8 Mon Sep 17 00:00:00 2001 From: sean wibisono Date: Mon, 20 Apr 2026 16:33:18 +1000 Subject: [PATCH 2/2] only use ci-auto-merge on protected branches --- .github/workflows/release-docker-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-docker-image.yaml b/.github/workflows/release-docker-image.yaml index 5f81dec9d..f218f32b7 100644 --- a/.github/workflows/release-docker-image.yaml +++ b/.github/workflows/release-docker-image.yaml @@ -26,5 +26,5 @@ jobs: release_type: ${{ inputs.release_type }} vulnerability_severity: ${{ inputs.vulnerability_severity }} java_version: 21 - merge_environment: 'ci-auto-merge' + merge_environment: ${{ github.ref_protected && 'ci-auto-merge' || '' }} secrets: inherit