Skip to content

Commit

Permalink
fix(demo) loose deleted files on demo branch WD-10413
Browse files Browse the repository at this point in the history
Signed-off-by: David Edler <david.edler@canonical.com>
  • Loading branch information
edlerd committed Apr 16, 2024
1 parent 55db954 commit 91deac3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/update_demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 91deac3

Please sign in to comment.