dependabot[bot]
f8af37db43
Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/8e8c483db84b4bee98b60c0593521ed34d9990e8...de0fac2e4500dabe0009e67214ff5f5447ce83dd) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 6.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
24 lines
1.1 KiB
YAML
24 lines
1.1 KiB
YAML
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}} |