Skip to content

Commit 0692ece

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feature/initial-contents
2 parents 7f6da47 + c0673b1 commit 0692ece

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

.github/workflows/docs.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
jobs:
1616
build_site:
1717
name: "Build site with Antora"
18-
runs-on: [ubuntu-24.04]
18+
runs-on: [ubuntu-22.04]
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
3535
pull-requests: write
3636
repository-projects: write
3737
id-token: write
38-
runs-on: [ubuntu-24.04]
38+
runs-on: [ubuntu-22.04]
3939
needs: [build_site]
4040
name: "Deploy GitHub Pages"
4141
if: github.event_name != 'pull_request'
@@ -48,11 +48,13 @@ jobs:
4848
name: site
4949
path: "${{ github.workspace }}/${{ env.SITE_DIR }}"
5050
- name: Deploy to GitHub Pages
51-
uses: JamesIves/github-pages-deploy-action@v4
51+
uses: peaceiris/actions-gh-pages@v4
5252
with:
53-
token: ${{ secrets.GITHUB_TOKEN }}
54-
folder: "${{ env.SITE_DIR }}"
55-
commit-message: "[CI] Publish Documentation for ${{ github.sha }}"
53+
github_token: ${{ secrets.GITHUB_TOKEN }}
54+
publish_dir: "${{ env.SITE_DIR }}"
55+
commit_message: "[CI] Publish Documentation for ${{ github.sha }}"
56+
user_name: 'github-actions[bot]'
57+
user_email: 'github-actions[bot]@users.noreply.github.com'
5658

5759
# Based on : https://daiyi.co/blog/pr-previews-for-github-pages/
5860
deploy_preview:
@@ -63,7 +65,7 @@ jobs:
6365
id-token: write
6466
env:
6567
PR_PATH: pull-${{ github.event.number }}
66-
runs-on: [ ubuntu-24.04 ]
68+
runs-on: [ ubuntu-22.04 ]
6769
needs: [ build_site ]
6870
name: "Deploy preview for PR"
6971
if: github.event_name == 'pull_request'
@@ -89,12 +91,14 @@ jobs:
8991
path: "${{ github.workspace }}/${{ env.SITE_DIR }}"
9092

9193
- name: Deploy PR preview
92-
uses: JamesIves/github-pages-deploy-action@v4
94+
uses: peaceiris/actions-gh-pages@v4
9395
with:
94-
token: ${{ secrets.GITHUB_TOKEN }}
95-
folder: "${{ env.SITE_DIR }}"
96-
target-folder: "${{ env.PR_PATH }}"
97-
commit-message: "[CI] Publish Preview for PR #${{ github.event.number }}"
96+
github_token: ${{ secrets.GITHUB_TOKEN }}
97+
publish_dir: "${{ env.SITE_DIR }}"
98+
destination_dir: "${{ env.PR_PATH }}"
99+
commit_message: "[CI] Publish Preview for PR #${{ github.event.number }}"
100+
user_name: 'github-actions[bot]'
101+
user_email: 'github-actions[bot]@users.noreply.github.com'
98102

99103
- name: Update comment
100104
uses: hasura/comment-progress@v2.3.0

.github/workflows/pr-close.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ jobs:
2020
run: "mkdir -p ${{ env.SITE_DIR }}"
2121

2222
- name: Removing PR preview
23-
uses: JamesIves/github-pages-deploy-action@v4
23+
uses: peaceiris/actions-gh-pages@v4
2424
with:
25-
token: ${{ secrets.GITHUB_TOKEN }}
26-
folder: "${{ env.SITE_DIR }}"
27-
target-folder: "${{ env.PR_PATH }}"
28-
commit-message: "[CI] Delete Preview for PR #${{ github.event.number }}"
25+
github_token: ${{ secrets.GITHUB_TOKEN }}
26+
publish_dir: "${{ env.SITE_DIR }}"
27+
destination_dir: "${{ env.PR_PATH }}"
28+
commit_message: "[CI] Delete Preview for PR #${{ github.event.number }}"
29+
user_name: 'github-actions[bot]'
30+
user_email: 'github-actions[bot]@users.noreply.github.com'
2931

3032
- name: Comment on PR
3133
uses: hasura/comment-progress@v2.3.0

0 commit comments

Comments
 (0)