Skip to content

Commit

Permalink
ci: deploy: configure git before rebase
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Goodfellow <[email protected]>
  • Loading branch information
rcgoodfellow committed Nov 14, 2024
1 parent 1981aa0 commit f1049b7
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/asciidoc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,24 @@ jobs:
deploy:
needs: build
if: github.repository == 'p4lang/p4-spec' && github.ref_name == 'main'
#if: github.repository == 'p4lang/p4-spec' && github.ref_name == 'main'
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
# Fetch all history for all branches
fetch-depth: 0

- name: Configure git
run: |
git config user.name "GitHub Actions"
git config user.email "[email protected]"
- name: Rebase gh-pages branch
run: |
git fetch --all
git checkout main
git pull
git checkout gh-pages
git rebase --quiet main
Expand All @@ -90,10 +98,6 @@ jobs:
name: api-charter
path: api-charter

- name: Configure git
run: |
git config user.name "GitHub Actions"
git config user.email "[email protected]"

- name: Copy files
run: |
Expand Down

0 comments on commit f1049b7

Please sign in to comment.