Skip to content

Commit ef1695d

Browse files
gemini9764gemini9764
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # .github/FUNDING.yml # .github/workflows/cd.yml # .github/workflows/ci.yml # .github/workflows/codeql.yml # .github/workflows/commitlint.yml # .github/workflows/stale.yml
2 parents b37c5c1 + ee68395 commit ef1695d

File tree

11 files changed

+192
-8
lines changed

11 files changed

+192
-8
lines changed

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ko_fi: coteschung

‎.github/workflows/cd.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: CD
2+
3+
on:
4+
push:
5+
branches: [production]
6+
tags-ignore: ["**"]
7+
8+
jobs:
9+
release:
10+
if: ${{ ! startsWith(github.event.head_commit.message, 'chore(release)') }}
11+
permissions:
12+
contents: write
13+
issues: write
14+
pull-requests: write
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v5
18+
19+
- uses: ruby/setup-ruby@v1
20+
with:
21+
ruby-version: 3.3
22+
bundler-cache: true
23+
24+
- uses: actions/setup-node@v5
25+
with:
26+
node-version: lts/*
27+
28+
- run: npm install
29+
- run: npx semantic-release
30+
env:
31+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32+
GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
33+
34+
publish:
35+
needs: release
36+
uses: ./.github/workflows/publish.yml
37+
secrets:
38+
GH_PAT: ${{ secrets.GH_PAT }}
39+
BUILDER: ${{ secrets.BUILDER }}

‎.github/workflows/ci.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- "hotfix/*"
8+
paths-ignore:
9+
- ".github/**"
10+
- "!.github/workflows/ci.yml"
11+
- .gitignore
12+
- "docs/**"
13+
- README.md
14+
- LICENSE
15+
pull_request:
16+
paths-ignore:
17+
- ".github/**"
18+
- "!.github/workflows/ci.yml"
19+
- .gitignore
20+
- "docs/**"
21+
- README.md
22+
- LICENSE
23+
24+
jobs:
25+
build:
26+
runs-on: ubuntu-latest
27+
28+
strategy:
29+
matrix:
30+
ruby: ["3.1", "3.2", "3.3"]
31+
32+
steps:
33+
- name: Checkout
34+
uses: actions/checkout@v5
35+
with:
36+
fetch-depth: 0 # for posts's lastmod
37+
38+
- name: Setup Ruby
39+
uses: ruby/setup-ruby@v1
40+
with:
41+
ruby-version: ${{ matrix.ruby }}
42+
bundler-cache: true
43+
44+
- name: Setup Node
45+
uses: actions/setup-node@v5
46+
with:
47+
node-version: lts/*
48+
49+
- name: Build Assets
50+
run: npm i && npm run build
51+
52+
- name: Test Site
53+
run: bash tools/test.sh

‎.github/workflows/codeql.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: ["master"]
6+
paths: ["_javascript/**/*.js"]
7+
pull_request:
8+
paths: ["_javascript/**/*.js"]
9+
10+
jobs:
11+
analyze:
12+
name: Analyze
13+
runs-on: ubuntu-latest
14+
permissions:
15+
actions: read
16+
contents: read
17+
security-events: write
18+
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
language: ["javascript"]
23+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
24+
25+
steps:
26+
- name: Checkout repository
27+
uses: actions/checkout@v5
28+
29+
# Initializes the CodeQL tools for scanning.
30+
- name: Initialize CodeQL
31+
uses: github/codeql-action/init@v4
32+
with:
33+
languages: "${{ matrix.language }}"
34+
config-file: .github/codeql/codeql-config.yml
35+
36+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
37+
# If this step fails, then you should remove it and run the build manually (see below)
38+
- name: Autobuild
39+
uses: github/codeql-action/autobuild@v4
40+
41+
- name: Perform CodeQL Analysis
42+
uses: github/codeql-action/analyze@v4
43+
with:
44+
category: "/language:${{ matrix.language }}"

‎.github/workflows/commitlint.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Lint Commit Messages
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- "hotfix/*"
8+
pull_request:
9+
10+
jobs:
11+
commitlint:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v5
15+
- uses: wagoid/commitlint-github-action@v6

‎.github/workflows/lint-js.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
lint-js:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020

2121
- name: Setup Node.js
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@v5
2323
with:
2424
node-version: lts/*
2525

‎.github/workflows/lint-scss.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
lint-scss:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616

1717
- name: Setup Node.js
18-
uses: actions/setup-node@v4
18+
uses: actions/setup-node@v5
1919
with:
2020
node-version: lts/*
2121

‎.github/workflows/pr-filter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313

1414
steps:
1515
- name: Checkout Code
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717

1818
- name: Check PR Content
1919
id: intercept
20-
uses: actions/github-script@v7
20+
uses: actions/github-script@v8
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
2323
script: |

‎.github/workflows/stale.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: "Close stale issues and PRs"
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * *" # every day at 00:00 UTC
6+
7+
permissions:
8+
issues: write
9+
pull-requests: write
10+
11+
env:
12+
STALE_LABEL: inactive
13+
EXEMPT_LABELS: "pending,planning,in progress"
14+
MESSAGE: >
15+
This conversation has been automatically marked as stale because it has not had recent activity.
16+
It will be closed if no further activity occurs.
17+
Thank you for your contributions.
18+
19+
jobs:
20+
stale:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: actions/stale@v10
24+
with:
25+
# 60 days before marking issues/PRs stale
26+
days-before-close: -1 # does not close automatically
27+
stale-issue-label: ${{ env.STALE_LABEL }}
28+
exempt-issue-labels: ${{ env.EXEMPT_LABELS }}
29+
stale-issue-message: ${{ env.MESSAGE }}
30+
stale-pr-label: ${{ env.STALE_LABEL }}
31+
exempt-pr-labels: ${{ env.EXEMPT_LABELS }}
32+
stale-pr-message: ${{ env.MESSAGE }}

‎_includes/refactor-content.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163

164164
{% if page.layout == 'home' %}
165165
<!-- create the image wrapper -->
166-
{% assign _wrapper_start = '<div class="preview-img ' | append: _class | append: '">' %}
166+
{% assign _wrapper_start = '<div class="preview-img ' | append: _wrapper_class | append: '">' %}
167167

168168
{% assign _img_content = _img_content | append: _wrapper_start %}
169169
{% assign _right = _right | prepend: '></div' %}

0 commit comments

Comments
 (0)