Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
AnnaBeiyan authored Dec 16, 2024
2 parents 3ca2395 + aa2f92e commit 6b9a8e5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
fetch-depth: 0
submodules: true

- uses: DeterminateSystems/nix-installer-action@main

- name: Install Node.js
uses: actions/setup-node@v4
with:
Expand All @@ -32,14 +34,8 @@ jobs:
- name: Install npm dependencies
run: npm install

- name: Set up Hugo
uses: peaceiris/actions-hugo@v2
with:
hugo-version: latest
extended: true

- name: Build site
run: hugo --minify --enableGitInfo
run: nix run github:nixos/nixpkgs/nixos-24.11#hugo -- --minify --enableGitInfo

- name: Deploy to Cloudflare Pages
id: deploy
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/preview-pr-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
fetch-depth: 0
submodules: true

- uses: DeterminateSystems/nix-installer-action@main

- name: 检出 PR 修改的部分
run: |
git fetch origin +refs/pull/${{ github.event.pull_request.number }}/merge
Expand All @@ -39,14 +41,8 @@ jobs:
- name: Install npm dependencies
run: npm install

- name: Set up Hugo
uses: peaceiris/actions-hugo@v2
with:
hugo-version: latest
extended: true

- name: Build site
run: hugo --minify --enableGitInfo --baseURL "/"
run: nix run github:nixos/nixpkgs/nixos-24.11#hugo -- --minify --enableGitInfo --baseURL "/"

- name: Deploy to Cloudflare Pages
id: deploy
Expand Down

0 comments on commit 6b9a8e5

Please sign in to comment.