/
githubmirror
/
oppia
Обзор
Документация
Войти
/
githubmirror
/
oppia
Код
Запросы
0
Пакеты
0
Релизы
0
Аналитика
Безопасность
develop
.github/actions/merge/action.yml
36 строк
1 KB
kundan
Fix #25031: Pin develop SHA for backend coverage checks to ensure consistency across CI jobs (#25318)
01 апр 2026, 09:59
Не верифицирован
01 апр 2026, 09:59
dd3bb47
Код
Авторство
О чём код?
name: 'Merge Source Branch into Base Branch' description: 'Merge the PR source branch into its base branch, leaving the merge commit checked-out' inputs: merge_sha: description: 'Specific commit SHA from develop to merge. If empty, falls back to latest develop.' required: false default: '' runs: using: 'composite' steps: - id: merge name: Merge run: | if [[ ${{ github.event_name}} != "pull_request" ]] then echo "Skipping merge because not triggered by a PR event." exit 0 fi echo "Base Repository: ${{ github.repository }}" echo "Base Branch: ${{ github.base_ref }}" echo "Head Repository: ${{ github.event.pull_request.head.repo.full_name }}" echo "Head Branch: $GITHUB_HEAD_REF" git config --global user.email "mergeAction@example.com" git config --global user.name "Oppia Merge Base Branch GitHub Action" git remote add source "https://github.com/${{ github.event.pull_request.head.repo.full_name }}.git" git remote add base "https://github.com/${{ github.repository }}.git" git fetch source $GITHUB_HEAD_REF if [ -n "${{ inputs.merge_sha }}" ]; then git fetch base ${{ inputs.merge_sha }} git checkout ${{ inputs.merge_sha }} else git fetch base ${{ github.base_ref }} git checkout base/${{ github.base_ref }} fi git merge source/$GITHUB_HEAD_REF shell: bash