From 91deac3d4b2da73d9fe465673d4e3f69d40f51c2 Mon Sep 17 00:00:00 2001 From: David Edler Date: Tue, 16 Apr 2024 17:12:50 +0200 Subject: [PATCH] fix(demo) loose deleted files on demo branch WD-10413 Signed-off-by: David Edler --- .github/workflows/update_demo.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update_demo.yml b/.github/workflows/update_demo.yml index d44a3c003..6e5a60d3a 100644 --- a/.github/workflows/update_demo.yml +++ b/.github/workflows/update_demo.yml @@ -11,14 +11,14 @@ jobs: if: ${{ github.repository_owner == 'canonical' }} steps: - uses: actions/checkout@v4 - with: - ref: demo - name: Fetch rebase and push if: github.ref == 'refs/heads/main' run: | git config --global user.email "github-action@example.com" git config --global user.name "GitHub Action" - git fetch origin main --depth 1 + git branch demo git checkout demo - git rebase -X ours origin/main # in rebase ours is the incoming branch - git push --force + touch wip-file + git add wip-file + git commit -am "wip" + git push origin demo --force