mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-08 23:18:10 -05:00
Adjust Build.yml workflow to use rebase again. (#10923)
Signed-off-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
committed by
GitHub
parent
851f17f5d8
commit
fff3a15b84
19
.github/workflows/Build.yml
vendored
19
.github/workflows/Build.yml
vendored
@@ -157,20 +157,17 @@ jobs:
|
||||
run: exit 1
|
||||
- name: Report update & build success
|
||||
run: echo "Update & build jobs succeeded. Creating a PR."
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
clean: false
|
||||
persist-credentials: true
|
||||
ref: ${{ github.ref_name }}
|
||||
- name: Merge Master
|
||||
- name: Rebase to Master
|
||||
run: |
|
||||
git init --ref-format=reftable
|
||||
git remote add origin https://github.com/chromebrew/chromebrew
|
||||
git fetch --all
|
||||
git checkout -f master
|
||||
git config user.name "${{ github.actor }}"
|
||||
git config user.email "${{ github.actor }}@users.noreply.github.com"
|
||||
git fetch --shallow-since="1 week"
|
||||
git pull origin master
|
||||
git pull origin ${{ github.ref_name }}
|
||||
git merge origin master
|
||||
git commit -m "Merge master into ${{ github.ref_name }}." || true
|
||||
git pull
|
||||
git checkout ${{ github.ref_name }} && git rebase master
|
||||
# git commit -m "Merge master into ${{ github.ref_name }}." || true
|
||||
- name: Push rebase
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
|
||||
Reference in New Issue
Block a user