Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/merge-conflict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
merge_conflict_job:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: Check for merge conflicts
run: |
# Find files with merge conflict markers
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/web-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ name: build gatsby
jobs:
build:

runs-on: ubuntu-20.04
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v6
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
Expand All @@ -26,23 +26,23 @@ jobs:
- run: cp .asf.yaml ./public

- name: Deploy-asf-staging
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: asf-site
publish_dir: ./public
destination_dir: ./

- name: Checkout master branch
uses: actions/checkout@v3
uses: actions/checkout@v5
with:
ref: master

- name: Fetch all branches
run: git fetch --all

- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v6
with:
python-version: '3.10'

Expand All @@ -56,7 +56,7 @@ jobs:
run: echo "::set-output name=dir::$(pip cache dir)"

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
Expand All @@ -71,7 +71,7 @@ jobs:
- run: cp ./index.html ./build/html

- name: Documents Deploy
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: asf-site
Expand Down