From 10b4446bb32136cabd499d05ac0baf2c8d0f1854 Mon Sep 17 00:00:00 2001 From: sean wibisono Date: Thu, 14 May 2026 10:24:23 +1000 Subject: [PATCH 1/2] use 'publish-major' env instead of hardcoded approver list --- .github/workflows/publish-all-operators.yaml | 17 ++++++++--------- .../publish-public-operator-docker-image.yaml | 10 ++-------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/publish-all-operators.yaml b/.github/workflows/publish-all-operators.yaml index 6c92b3429..3bf85e9dd 100644 --- a/.github/workflows/publish-all-operators.yaml +++ b/.github/workflows/publish-all-operators.yaml @@ -22,8 +22,16 @@ on: - cron: "0 0 * * *" jobs: + check_major: + name: Check if major release + runs-on: ubuntu-latest + environment: ${{ inputs.release_type == 'Major' && 'publish-major' || '' }} + steps: + - run: echo "Major release approved" + start: name: Start Operator Build + needs: check_major runs-on: ubuntu-latest environment: ${{ github.ref_protected && 'ci-auto-merge' || '' }} outputs: @@ -42,15 +50,6 @@ jobs: echo "vulnerability_severity=${{ inputs.vulnerability_severity || (github.event_name == 'schedule' && 'CRITICAL,HIGH') }}" >> $GITHUB_ENV echo "release_type=${RELEASE_TYPE}" >> $GITHUB_OUTPUT echo "vulnerability_severity=${VULNERABILITY_SEVERITY}" >> $GITHUB_OUTPUT - - name: Approve Major release - if: env.RELEASE_TYPE == 'Major' - uses: trstringer/manual-approval@74d99dff7380e3e4b122d4ededcbca2b6ce59367 # v1 - with: - secret: ${{ github.token }} - approvers: atarassov-ttd,vishalegbert-ttd,sunnywu,clarkxuyang - minimum-approvals: 1 - issue-title: Creating Major version of UID2-Operator - - name: Show Context run: | printenv diff --git a/.github/workflows/publish-public-operator-docker-image.yaml b/.github/workflows/publish-public-operator-docker-image.yaml index ef9ee24f4..4afce676b 100644 --- a/.github/workflows/publish-public-operator-docker-image.yaml +++ b/.github/workflows/publish-public-operator-docker-image.yaml @@ -47,15 +47,9 @@ jobs: check_major: name: Check if major release runs-on: ubuntu-latest + environment: ${{ inputs.release_type == 'Major' && 'publish-major' || '' }} steps: - - name: Approve Major release - if: inputs.release_type == 'Major' - uses: trstringer/manual-approval@74d99dff7380e3e4b122d4ededcbca2b6ce59367 # v1 - with: - secret: ${{ github.token }} - approvers: atarassov-ttd,vishalegbert-ttd,sunnywu,clarkxuyang - minimum-approvals: 1 - issue-title: Creating Major version of UID2-Operator + - run: echo "Major release approved" image: name: Image From c76df94c1dbb3a6fd096f836fb027bf204afb8e9 Mon Sep 17 00:00:00 2001 From: sean wibisono Date: Thu, 14 May 2026 14:06:58 +1000 Subject: [PATCH 2/2] only print Major release approved when it's actually a Major release --- .github/workflows/publish-all-operators.yaml | 2 +- .github/workflows/publish-public-operator-docker-image.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-all-operators.yaml b/.github/workflows/publish-all-operators.yaml index 3bf85e9dd..8a14a3bc8 100644 --- a/.github/workflows/publish-all-operators.yaml +++ b/.github/workflows/publish-all-operators.yaml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest environment: ${{ inputs.release_type == 'Major' && 'publish-major' || '' }} steps: - - run: echo "Major release approved" + - run: echo "${{ inputs.release_type == 'Major' && 'Major release approved' || 'Skipped - not a Major release' }}" start: name: Start Operator Build diff --git a/.github/workflows/publish-public-operator-docker-image.yaml b/.github/workflows/publish-public-operator-docker-image.yaml index 4afce676b..d0ec8cb4c 100644 --- a/.github/workflows/publish-public-operator-docker-image.yaml +++ b/.github/workflows/publish-public-operator-docker-image.yaml @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest environment: ${{ inputs.release_type == 'Major' && 'publish-major' || '' }} steps: - - run: echo "Major release approved" + - run: echo "${{ inputs.release_type == 'Major' && 'Major release approved' || 'Skipped - not a Major release' }}" image: name: Image