From 4565676d4b43d32b93cf1093edb1ff6b57f3ef29 Mon Sep 17 00:00:00 2001
From: Zhihe Li <zhihe.li@hashicorp.com>
Date: Mon, 21 Sep 2026 16:07:07 -0400
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Remove=20merge=20trigge?=
 =?UTF-8?q?r=20for=20ENT=20(#3351)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/oss-ent-merge-trigger.yml | 25 ---------------------
 .github/workflows/oss-merge.yml             | 24 --------------------
 2 files changed, 49 deletions(-)
 delete mode 100644 .github/workflows/oss-ent-merge-trigger.yml
 delete mode 100644 .github/workflows/oss-merge.yml

diff --git a/.github/workflows/oss-ent-merge-trigger.yml b/.github/workflows/oss-ent-merge-trigger.yml
deleted file mode 100644
index b84cee4e3..000000000
--- a/.github/workflows/oss-ent-merge-trigger.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Trigger OSS to Enterprise Merge
-on:
-  pull_request_target:
-    types:
-      - closed
-    branches:
-      - main
-
-jobs:
-  trigger-oss-merge:
-    # Run this only on merge events in OSS repo
-    if: ${{ github.event.pull_request.merged && github.repository == 'hashicorp/boundary-ui' }}
-    runs-on: ${{ fromJSON(vars.RUNNER) }}
-    steps:
-      - name: Trigger Merge
-        env:
-          GIT_REF: ${{ github.ref_name }}
-          GIT_SHA: ${{ github.sha }}
-          GH_PAT: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
-          GIT_ACTOR: ${{ github.actor }}
-        run: |
-          curl -H "Authorization: token $GH_PAT" \
-            -H 'Accept: application/json' \
-            -d "{\"event_type\": \"oss-merge\", \"client_payload\": {\"git-ref\": \"${GIT_REF}\", \"git-sha\": \"${GIT_SHA}\", \"git-actor\": \"${GIT_ACTOR}\" }}" \
-            "https://api.github.com/repos/hashicorp/boundary-ui-enterprise/dispatches"
\ No newline at end of file
diff --git a/.github/workflows/oss-merge.yml b/.github/workflows/oss-merge.yml
deleted file mode 100644
index b436bb46c..000000000
--- a/.github/workflows/oss-merge.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: OSS → ENT Merge
-on:
-  repository_dispatch:
-    types: [ oss-merge ]
-jobs:
-  oss-merge:
-    runs-on: ${{ fromJSON(vars.RUNNER) }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
-      - run: |
-          git fetch --prune --unshallow
-          ./.github/scripts/merge.sh "${BASE_BRANCH}" "${MERGE_BRANCH}"
-        env:
-          BASE_BRANCH: ${{ github.event.client_payload.git-ref }}
-          OSS_BRANCH:  oss-remote/${{ github.event.client_payload.git-ref }}
-          OSS_LOCAL_BRANCH:  oss/${{ github.event.client_payload.git-ref }}-${{ github.event.client_payload.git-sha }}
-          MERGE_BRANCH: oss/merge-${{ github.event.client_payload.git-ref }}-${{github.event.client_payload.git-sha}}
-          GITHUB_TOKEN: ${{secrets.ELEVATED_GITHUB_TOKEN }}
-          MERGE_APPROVE_TOKEN: ${{secrets.ELEVATED_GITHUB_TOKEN }}
-          ACTOR: ${{ github.event.client_payload.git-actor }}
-          SHA: ${{github.event.client_payload.git-sha}}
\ No newline at end of file