Skip to content

fix(action): allow merging cpython on existing branch #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2021
Merged

fix(action): allow merging cpython on existing branch #110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/py39-sync-cpython.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,18 @@ jobs:
runs-on: ubuntu-latest
env:
VERSION: "3.9"
BRANCH: "cron/sync/3.9"
steps:
- uses: actions/checkout@v2
with:
ref: ${{ env.VERSION }}

- name: Get the changes on branch (if exists)
continue-on-error: true
run: |
git fetch origin ${{ env.BRANCH }}:${{ env.BRANCH }}
git reset --hard ${{ env.BRANCH }}

- name: Set env
run: echo "LATEST_COMMIT_ID=$(git ls-remote https://github.com/python/CPython.git $VERSION | head -c 8)" >> $GITHUB_ENV

Expand All @@ -41,8 +48,8 @@ jobs:
committer: GitHub <noreply@github.com>
author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
base: ${{ env.VERSION }}
branch: cron/sync/${{ env.VERSION }}
delete-branch: true
branch: ${{ env.BRANCH }}
delete-branch: false
title: 'Sync with CPython ${{ env.VERSION }}'
body: |
Sync with CPython ${{ env.VERSION }}
Expand Down