From fff3a15b84b71aff1e4fce581196b907327f4c7e Mon Sep 17 00:00:00 2001 From: "Satadru Pramanik, DO, MPH, MEng" Date: Tue, 10 Dec 2024 13:33:51 -0500 Subject: [PATCH] Adjust Build.yml workflow to use rebase again. (#10923) Signed-off-by: Satadru Pramanik --- .github/workflows/Build.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index fb6e74eaa..11b22b2df 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -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: