Skip to content

Commit af845f8

Browse files
committed
git pull --rebase before push
1 parent 70f1fed commit af845f8

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

.github/workflows/deploy-site.yaml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ on:
99
default: "master"
1010

1111
permissions:
12-
contents: read
13-
pages: write
14-
id-token: write
12+
contents: write
1513

1614
jobs:
1715
build:
1816
runs-on: ubuntu-latest
1917
steps:
2018
- uses: actions/checkout@v4
19+
- name: "Fetch gh-pages branch"
20+
run: git fetch origin gh-pages --depth=1
2121
- name: "Set permissions"
2222
run: chmod -R a+rwX $(pwd)
2323
- name: "Build site"
@@ -26,13 +26,9 @@ jobs:
2626
quay.io/openssl-ci/docs:20240711-115832 sh -c "\
2727
git config --global --add safe.directory /mnt && \
2828
python build.py ${{ github.event.inputs.branch }}"
29-
- name: "Change branch"
30-
run: git switch gh-pages
31-
- name: "Setup GitHub Pages"
32-
uses: actions/configure-pages@v5
33-
- name: "Upload artifact"
34-
uses: actions/upload-pages-artifact@v3
35-
with:
36-
path: "."
37-
- name: "Deploy to GitHub Pages"
38-
uses: actions/deploy-pages@v4
29+
- name: "Push branch"
30+
run: |
31+
git config user.name openssl-machine
32+
git config user.email [email protected]
33+
git pull --rebase origin gh-pages
34+
git push origin gh-pages

0 commit comments

Comments
 (0)