scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-08-28 22:12:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Release Workflow

Browse source 
Add --no-ff flag to `git merge` line in the release branch creation workflow. This should ensure that we're always creating a merge commit on the release branch when pulling in changes from develop to stage for the release.
This commit is contained in:
Karishma Chadha 2021-09-28 13:10:04 -04:00 • committed by GitHub
parent 8e469e6d0c
commit 5b877189eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View file

@ -29,7 +29,7 @@ jobs:
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
git config --global user.name "${{ github.actor }}"
git checkout -b ${{ steps.vars.outputs.branch }}
git merge origin/develop
git merge --no-ff origin/develop
git push --set-upstream origin ${{ steps.vars.outputs.branch }}
- name: Develop PR
uses: repo-sync/pull-request@v2