Commit2d3ada9

authored

Merge pull request#110 from mattwang44/fix/sync-workflow/edit-on-branch

fix(action): allow merging cpython on existing branch

2 parents9c34230 +841a567 commit2d3ada9Copy full SHA for 2d3ada9

File tree

-2

lines changed

-2

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,18 @@ jobs:`
`12`	`12`	`runs-on:ubuntu-latest`
`13`	`13`	`env:`
`14`	`14`	`VERSION:"3.9"`
	`15`	`+BRANCH:"cron/sync/3.9"`
`15`	`16`	`steps:`
`16`	`17`	`-uses:actions/checkout@v2`
`17`	`18`	`with:`
`18`	`19`	`ref:${{ env.VERSION }}`
`19`	`20`
	`21`	`+ -name:Get the changes on branch (if exists)`
	`22`	`+continue-on-error:true`
	`23`	`+run:\|`
	`24`	`+ git fetch origin ${{ env.BRANCH }}:${{ env.BRANCH }}`
	`25`	`+ git reset --hard ${{ env.BRANCH }}`
	`26`	`+`
`20`	`27`	`-name:Set env`
`21`	`28`	`run:echo "LATEST_COMMIT_ID=$(git ls-remote https://github.com/python/CPython.git $VERSION \| head -c 8)" >> $GITHUB_ENV`
`22`	`29`
`@@ -41,8 +48,8 @@ jobs:`
`41`	`48`	`committer:GitHub <noreply@github.com>`
`42`	`49`	`author:github-actions[bot] <github-actions[bot]@users.noreply.github.com>`
`43`	`50`	`base:${{ env.VERSION }}`
`44`		`-branch:cron/sync/${{ env.VERSION }}`
`45`		`-delete-branch:true`
	`51`	`+branch:${{ env.BRANCH }}`
	`52`	`+delete-branch:false`
`46`	`53`	`title:'Sync with CPython ${{ env.VERSION }}'`
`47`	`54`	`body:\|`
`48`	`55`	`Sync with CPython ${{ env.VERSION }}`

Comments

(0)