Skip to content

Commit 40ce6a5

Browse files
authored
Merge branch 'v4' into dependabot/github_actions/ci-dependencies-cb3525d1d8
2 parents 10ff20f + 6a8092f commit 40ce6a5

File tree

296 files changed

+18955
-4907
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+18955
-4907
lines changed

.github/pull_request_template.md

Lines changed: 31 additions & 0 deletions
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Build Preview Deployment
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
workflow_dispatch:
7+
8+
jobs:
9+
build-preview:
10+
if: ${{ github.repository == 'jackyzha0/quartz' }}
11+
runs-on: ubuntu-latest
12+
name: Build Preview
13+
steps:
14+
- uses: actions/checkout@v5
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Setup Node
19+
uses: actions/setup-node@v5
20+
with:
21+
node-version: 22
22+
23+
- name: Cache dependencies
24+
uses: actions/cache@v4
25+
with:
26+
path: ~/.npm
27+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
28+
restore-keys: |
29+
${{ runner.os }}-node-
30+
31+
- run: npm ci
32+
33+
- name: Check types and style
34+
run: npm run check
35+
36+
- name: Build Quartz
37+
run: npx quartz build -d docs -v
38+
39+
- name: Upload build artifact
40+
uses: actions/upload-artifact@v4
41+
with:
42+
name: preview-build
43+
path: public

.github/workflows/ci.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
permissions:
2020
contents: write
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
with:
2424
fetch-depth: 0
2525

2626
- name: Setup Node
27-
uses: actions/setup-node@v4
27+
uses: actions/setup-node@v5
2828
with:
29-
node-version: 20
29+
node-version: 22
3030

3131
- name: Cache dependencies
3232
uses: actions/cache@v4
@@ -45,21 +45,21 @@ jobs:
4545
run: npm test
4646

4747
- name: Ensure Quartz builds, check bundle info
48-
run: npx quartz build --bundleInfo
48+
run: npx quartz build --bundleInfo -d docs
4949

5050
publish-tag:
5151
if: ${{ github.repository == 'jackyzha0/quartz' && github.ref == 'refs/heads/v4' }}
5252
runs-on: ubuntu-latest
5353
permissions:
5454
contents: write
5555
steps:
56-
- uses: actions/checkout@v4
56+
- uses: actions/checkout@v5
5757
with:
5858
fetch-depth: 0
5959
- name: Setup Node
60-
uses: actions/setup-node@v4
60+
uses: actions/setup-node@v5
6161
with:
62-
node-version: 20
62+
node-version: 22
6363
- name: Get package version
6464
run: node -p -e '`PACKAGE_VERSION=${require("./package.json").version}`' >> $GITHUB_ENV
6565
- name: Create release tag
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Upload Preview Deployment
2+
on:
3+
workflow_run:
4+
workflows: ["Build Preview Deployment"]
5+
types:
6+
- completed
7+
8+
permissions:
9+
actions: read
10+
deployments: write
11+
contents: read
12+
pull-requests: write
13+
14+
jobs:
15+
deploy-preview:
16+
if: ${{ github.repository == 'jackyzha0/quartz' && github.event.workflow_run.conclusion == 'success' }}
17+
runs-on: ubuntu-latest
18+
name: Deploy Preview to Cloudflare Pages
19+
steps:
20+
- name: Download build artifact
21+
uses: actions/download-artifact@v5
22+
id: preview-build-artifact
23+
with:
24+
name: preview-build
25+
path: build
26+
github-token: ${{ secrets.GITHUB_TOKEN }}
27+
run-id: ${{ github.event.workflow_run.id }}
28+
29+
- name: Deploy to Cloudflare Pages
30+
uses: AdrianGonz97/refined-cf-pages-action@v1
31+
with:
32+
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
33+
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
34+
githubToken: ${{ secrets.GITHUB_TOKEN }}
35+
projectName: quartz
36+
deploymentName: Branch Preview
37+
directory: ${{ steps.preview-build-artifact.outputs.download-path }}

.github/workflows/docker-build-push.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
echo "OWNER_LOWERCASE=${OWNER,,}" >> ${GITHUB_ENV}
2222
env:
2323
OWNER: "${{ github.repository_owner }}"
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
with:
2626
fetch-depth: 1
2727
- name: Inject slug/short variables
28-
uses: rlespinasse/github-slug-action@v5.1.0
28+
uses: rlespinasse/github-slug-action@v5.2.0
2929
- name: Set up QEMU
3030
uses: docker/setup-qemu-action@v3
3131
- name: Set up Docker Buildx
@@ -37,7 +37,7 @@ jobs:
3737
network=host
3838
- name: Install cosign
3939
if: github.event_name != 'pull_request'
40-
uses: sigstore/cosign-installer@v3.8.2
40+
uses: sigstore/cosign-installer@v3.10.0
4141
- name: Login to GitHub Container Registry
4242
uses: docker/login-action@v3
4343
if: github.event_name != 'pull_request'

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.9.0
1+
v22.16.0

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM node:20-slim AS builder
1+
FROM node:22-slim AS builder
22
WORKDIR /usr/src/app
33
COPY package.json .
44
COPY package-lock.json* .
55
RUN npm ci
66

7-
FROM node:20-slim
7+
FROM node:22-slim
88
WORKDIR /usr/src/app
99
COPY --from=builder /usr/src/app/ /usr/src/app/
1010
COPY . .

content/Quartz/index.md

Lines changed: 2 additions & 0 deletions
11.1 KB
122 KB

0 commit comments

Comments
 (0)