4cdcaefe15
Co-authored-by: hashicorp-tsccr[bot] <hashicorp-tsccr[bot]@users.noreply.github.com> Co-authored-by: Dharini Jeeva <dharini@hashicorp.com>
24 lines
1.0 KiB
YAML
24 lines
1.0 KiB
YAML
name: OSS → ENT Merge
|
|
on:
|
|
repository_dispatch:
|
|
types: [ oss-merge ]
|
|
jobs:
|
|
oss-merge:
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- name: Checkout
|
|
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
|
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}} |