chore: 🤖 Remove merge trigger for ENT (#3351)
This commit is contained in:
1 parent
ed9371fab7
commit
4565676d4b
2 files changed
-49
No files matched your search
@@ -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"
|
||||
@@ -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}}
|
||||
Reference in new issue
Block a user