Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
xinwuchn committed Nov 24, 2024
1 parent 8b12959 commit eed4afe
Show file tree
Hide file tree
Showing 136 changed files with 18,127 additions and 15,622 deletions.
6 changes: 5 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@

"customizations": {
"vscode": {
"extensions": ["esbenp.prettier-vscode", "sissel.shopify-liquid", "yzhang.markdown-all-in-one"],
"extensions": [
"esbenp.prettier-vscode",
"sissel.shopify-liquid",
"yzhang.markdown-all-in-one"
],
"settings": {
// use prettier code formatter as default formatter
"editor.defaultFormatter": "esbenp.prettier-vscode",
Expand Down
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/1_bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 🐛 Report a bug
description: Any errors.
labels: ["needs triage", "bug"]
labels: ['needs triage', 'bug']
body:
- type: markdown
attributes:
Expand Down Expand Up @@ -52,7 +52,7 @@ body:
label: Error messages and logs
description: >
Provide any error messages and/or logs
placeholder: "Copy the complete error messages and logs"
placeholder: 'Copy the complete error messages and logs'
value: |
```
The error message you got, with the full traceback if available. Please paste it between these triple backticks.
Expand Down Expand Up @@ -81,9 +81,9 @@ body:
description: select all environments where you have experienced this issue
multiple: true
options:
- "Running locally with Docker"
- "Running locally without Docker"
- "Deployed site"
- 'Running locally with Docker'
- 'Running locally without Docker'
- 'Deployed site'
validations:
required: true

Expand All @@ -98,4 +98,4 @@ body:

- type: markdown
attributes:
value: "**Happy coding!**"
value: '**Happy coding!**'
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/2_feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 🚀 Feature request
description: Propose a feature for this project
labels: ["needs triage", "enhancement"]
labels: ['needs triage', 'enhancement']
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ changelog:
- bug-fix
- title: other changes 🛠️
labels:
- "*"
- '*'
8 changes: 4 additions & 4 deletions .github/workflows/axe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ on:
workflow_dispatch:
inputs:
url:
description: "URL to be checked (e.g.: blog/)"
description: 'URL to be checked (e.g.: blog/)'
required: false

env:
URL: ""
URL: ''

jobs:
check:
Expand All @@ -29,13 +29,13 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2.2"
ruby-version: '3.2.2'
bundler-cache: true
- name: Update _config.yml ⚙️
uses: fjogeleit/yaml-update-action@main
with:
commitChange: false
valueFile: "_config.yml"
valueFile: '_config.yml'
changes: |
{
"giscus.repo": "${{ github.repository }}",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/broken-links-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2.2"
ruby-version: '3.2.2'
bundler-cache: true
- name: Update _config.yml ⚙️
uses: fjogeleit/yaml-update-action@main
with:
commitChange: false
valueFile: "_config.yml"
valueFile: '_config.yml'
changes: |
{
"giscus.repo": "${{ github.repository }}",
Expand Down
52 changes: 26 additions & 26 deletions .github/workflows/broken-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,37 @@ on:
- master
- main
paths:
- "assets/**"
- "**.html"
- "**.js"
- "**.liquid"
- "**/*.md"
- "**.yml"
- "!.github/workflows/axe.yml"
- "!.github/workflows/deploy-docker-tag.yml"
- "!.github/workflows/deploy-image.yml"
- "!.github/workflows/docker-slim.yml"
- "!.github/workflows/lighthouse-badger.yml"
- "!.github/workflows/prettier.yml"
- "!lighthouse_results/**"
- 'assets/**'
- '**.html'
- '**.js'
- '**.liquid'
- '**/*.md'
- '**.yml'
- '!.github/workflows/axe.yml'
- '!.github/workflows/deploy-docker-tag.yml'
- '!.github/workflows/deploy-image.yml'
- '!.github/workflows/docker-slim.yml'
- '!.github/workflows/lighthouse-badger.yml'
- '!.github/workflows/prettier.yml'
- '!lighthouse_results/**'
pull_request:
branches:
- master
- main
paths:
- "assets/**"
- "**.html"
- "**.js"
- "**.liquid"
- "**/*.md"
- "**.yml"
- "!.github/workflows/axe.yml"
- "!.github/workflows/deploy-docker-tag.yml"
- "!.github/workflows/deploy-image.yml"
- "!.github/workflows/docker-slim.yml"
- "!.github/workflows/lighthouse-badger.yml"
- "!.github/workflows/prettier.yml"
- "!lighthouse_results/**"
- 'assets/**'
- '**.html'
- '**.js'
- '**.liquid'
- '**/*.md'
- '**.yml'
- '!.github/workflows/axe.yml'
- '!.github/workflows/deploy-docker-tag.yml'
- '!.github/workflows/deploy-image.yml'
- '!.github/workflows/docker-slim.yml'
- '!.github/workflows/lighthouse-badger.yml'
- '!.github/workflows/prettier.yml'
- '!lighthouse_results/**'

jobs:
link-checker:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/deploy-docker-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ name: Docker Image CI (Upload Tag)
on:
push:
tags:
- "v*"
- 'v*'
paths:
- ".github/workflows/deploy-docker-tag.yml"
- ".github/workflows/deploy-image.yml"
- "bin/entry_point.sh"
- "Dockerfile"
- "Gemfile"
- "Gemfile.lock"
- "package.json"
- "package-lock.json"
- '.github/workflows/deploy-docker-tag.yml'
- '.github/workflows/deploy-image.yml'
- 'bin/entry_point.sh'
- 'Dockerfile'
- 'Gemfile'
- 'Gemfile.lock'
- 'package.json'
- 'package-lock.json'

jobs:
build:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/deploy-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ on:
- master
- main
paths:
- ".github/workflows/deploy-image.yml"
- "bin/entry_point.sh"
- "Dockerfile"
- "Gemfile"
- "Gemfile.lock"
- "package.json"
- "package-lock.json"
- '.github/workflows/deploy-image.yml'
- 'bin/entry_point.sh'
- 'Dockerfile'
- 'Gemfile'
- 'Gemfile.lock'
- 'package.json'
- 'package-lock.json'

jobs:
build:
Expand Down
94 changes: 47 additions & 47 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,55 @@ on:
- master
- main
paths:
- "assets/**"
- "**.bib"
- "**.html"
- "**.js"
- "**.liquid"
- "**/*.md"
- "**.yml"
- "Gemfile"
- "Gemfile.lock"
- "!.github/workflows/axe.yml"
- "!.github/workflows/broken-links.yml"
- "!.github/workflows/deploy-docker-tag.yml"
- "!.github/workflows/deploy-image.yml"
- "!.github/workflows/docker-slim.yml"
- "!.github/workflows/lighthouse-badger.yml"
- "!.github/workflows/prettier.yml"
- "!lighthouse_results/**"
- "!CONTRIBUTING.md"
- "!CUSTOMIZE.md"
- "!FAQ.md"
- "!INSTALL.md"
- "!README.md"
- 'assets/**'
- '**.bib'
- '**.html'
- '**.js'
- '**.liquid'
- '**/*.md'
- '**.yml'
- 'Gemfile'
- 'Gemfile.lock'
- '!.github/workflows/axe.yml'
- '!.github/workflows/broken-links.yml'
- '!.github/workflows/deploy-docker-tag.yml'
- '!.github/workflows/deploy-image.yml'
- '!.github/workflows/docker-slim.yml'
- '!.github/workflows/lighthouse-badger.yml'
- '!.github/workflows/prettier.yml'
- '!lighthouse_results/**'
- '!CONTRIBUTING.md'
- '!CUSTOMIZE.md'
- '!FAQ.md'
- '!INSTALL.md'
- '!README.md'
pull_request:
branches:
- master
- main
paths:
- "assets/**"
- "**.bib"
- "**.html"
- "**.js"
- "**.liquid"
- "**/*.md"
- "**.yml"
- "Gemfile"
- "Gemfile.lock"
- "!.github/workflows/axe.yml"
- "!.github/workflows/broken-links.yml"
- "!.github/workflows/deploy-docker-tag.yml"
- "!.github/workflows/deploy-image.yml"
- "!.github/workflows/docker-slim.yml"
- "!.github/workflows/lighthouse-badger.yml"
- "!.github/workflows/prettier.yml"
- "!lighthouse_results/**"
- "!CONTRIBUTING.md"
- "!CUSTOMIZE.md"
- "!FAQ.md"
- "!INSTALL.md"
- "!README.md"
- 'assets/**'
- '**.bib'
- '**.html'
- '**.js'
- '**.liquid'
- '**/*.md'
- '**.yml'
- 'Gemfile'
- 'Gemfile.lock'
- '!.github/workflows/axe.yml'
- '!.github/workflows/broken-links.yml'
- '!.github/workflows/deploy-docker-tag.yml'
- '!.github/workflows/deploy-image.yml'
- '!.github/workflows/docker-slim.yml'
- '!.github/workflows/lighthouse-badger.yml'
- '!.github/workflows/prettier.yml'
- '!lighthouse_results/**'
- '!CONTRIBUTING.md'
- '!CUSTOMIZE.md'
- '!FAQ.md'
- '!INSTALL.md'
- '!README.md'
workflow_dispatch:

permissions:
Expand All @@ -70,14 +70,14 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.1.4"
ruby-version: '3.1.4'
bundler-cache: true
- name: Update _config.yml ⚙️
uses: fjogeleit/yaml-update-action@main
with:
commitChange: false
valueFile: "_config.yml"
propertyPath: "giscus.repo"
valueFile: '_config.yml'
propertyPath: 'giscus.repo'
value: ${{ github.repository }}
- name: Install and Build 🔧
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-slim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
- master
- main
paths:
- ".github/workflows/docker-slim.yml"
- '.github/workflows/docker-slim.yml'
workflow_run:
workflows: ["Docker Image CI"]
workflows: ['Docker Image CI']
types:
- completed

Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
DSLIM_CONTINUE_AFTER: signal
with:
target: amirpourmand/al-folio
tag: "slim"
tag: 'slim'

# Push to the registry
- run: docker image push amirpourmand/al-folio:slim
10 changes: 5 additions & 5 deletions .github/workflows/lighthouse-badger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# License: MIT
# Copyright (c) 2021 Sitdisch

name: "Lighthouse Badger"
name: 'Lighthouse Badger'

########################################################################
# DEFINE YOUR INPUTS AND TRIGGERS IN THE FOLLOWING
Expand All @@ -16,9 +16,9 @@ name: "Lighthouse Badger"
env:
URLS: https://alshedivat.github.io/al-folio/
# If any of the following env is blank, a default value is used instead
REPO_BRANCH: "${{ github.repository }} master" # target repository & branch e.g. 'dummy/mytargetrepo main'
MOBILE_LIGHTHOUSE_PARAMS: "--only-categories=performance,accessibility,best-practices,seo --throttling.cpuSlowdownMultiplier=2"
DESKTOP_LIGHTHOUSE_PARAMS: "--only-categories=performance,accessibility,best-practices,seo --preset=desktop --throttling.cpuSlowdownMultiplier=1"
REPO_BRANCH: '${{ github.repository }} master' # target repository & branch e.g. 'dummy/mytargetrepo main'
MOBILE_LIGHTHOUSE_PARAMS: '--only-categories=performance,accessibility,best-practices,seo --throttling.cpuSlowdownMultiplier=2'
DESKTOP_LIGHTHOUSE_PARAMS: '--only-categories=performance,accessibility,best-practices,seo --preset=desktop --throttling.cpuSlowdownMultiplier=1'

# TRIGGERS
on:
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
ref: ${{ env.BRANCH }}
- uses: actions/checkout@v4
with:
repository: "myactionway/lighthouse-badges"
repository: 'myactionway/lighthouse-badges'
path: temp_lighthouse_badges_nested
- uses: myactionway/[email protected]
with:
Expand Down
Loading

0 comments on commit eed4afe

Please sign in to comment.