Skip to content

Commit 901c82f

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 1e4fc18 + a738587 commit 901c82f

File tree

162 files changed

+28560
-44437
lines changed

Some content is hidden

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

162 files changed

+28560
-44437
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Force LF line endings, needed for Docker to work on Windows
2+
*.sh text eol=lf

.github/ISSUE_TEMPLATE/1_bug_report.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ body:
77
value: >
88
Before you go any further. Is this really a **🐛 bug**?
99
10-
If it's a question about how al-folio works, have a look at our [documentation](https://github.com/alshedivat/al-folio/blob/master/README.md),
11-
[frequently asked questions](https://github.com/alshedivat/al-folio/blob/master/FAQ.md),
10+
If it's a question about how al-folio works, have a look at our [documentation](https://github.com/alshedivat/al-folio/blob/main/README.md),
11+
[frequently asked questions](https://github.com/alshedivat/al-folio/blob/main/FAQ.md),
1212
[past questions](https://github.com/alshedivat/al-folio/discussions/categories/q-a),
1313
or [ask a question](https://github.com/alshedivat/al-folio/discussions/new?category=q-a) there. If your question is related to localization,
1414
please check if it was not already answered in the Q&A section of the [GitHub Discussions](https://github.com/george-gca/multi-language-al-folio/discussions/categories/q-a) or
@@ -22,7 +22,7 @@ body:
2222
Please check if somebody else has already filed the same issue.
2323
If you find a similar issue, please add a 👍 reaction or comment on the original post.
2424
options:
25-
- label: I read through [FAQ](https://github.com/george-gca/multi-language-al-folio/blob/master/FAQ.md) and searched through the past issues both in the [original repo](https://github.com/alshedivat/al-folio/issues) and [this one](https://github.com/george-gca/multi-language-al-folio/issues), none of which addressed my issue.
25+
- label: I read through [FAQ](https://github.com/george-gca/multi-language-al-folio/blob/main/FAQ.md) and searched through the past issues both in the [original repo](https://github.com/alshedivat/al-folio/issues) and [this one](https://github.com/george-gca/multi-language-al-folio/issues), none of which addressed my issue.
2626
required: true
2727
- label: Yes, I have checked that this issue isn't already filed.
2828
required: true
@@ -83,7 +83,8 @@ body:
8383
description: select all environments where you have experienced this issue
8484
multiple: true
8585
options:
86-
- "Running locally with Docker"
86+
- "Running locally with Docker (docker compose)"
87+
- "Running locally with Docker (devcontainer)"
8788
- "Running locally without Docker"
8889
- "Deployed site"
8990
validations:

.github/ISSUE_TEMPLATE/2_feature_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ body:
77
value: >
88
Before you go any further, are you sure that this feature is not already implemented?
99
10-
If it's a question about how al-folio works, have a look at our [documentation](https://github.com/alshedivat/al-folio/blob/master/README.md),
11-
[frequently asked questions](https://github.com/alshedivat/al-folio/blob/master/FAQ.md),
10+
If it's a question about how al-folio works, have a look at our [documentation](https://github.com/alshedivat/al-folio/blob/main/README.md),
11+
[frequently asked questions](https://github.com/alshedivat/al-folio/blob/main/FAQ.md),
1212
[past questions](https://github.com/alshedivat/al-folio/discussions/categories/q-a),
1313
or [ask a question](https://github.com/alshedivat/al-folio/discussions/new?category=q-a) there. If your question is related to localization,
1414
please check if it was not already answered in the Q&A section of the [GitHub Discussions](https://github.com/george-gca/multi-language-al-folio/discussions/categories/q-a) or
@@ -22,7 +22,7 @@ body:
2222
Please check if somebody else has already filed the same 🚀 feature request.
2323
If you find a similar feature request, please add a 👍 reaction or comment on the original post.
2424
options:
25-
- label: I read through [FAQ](https://github.com/george-gca/multi-language-al-folio/blob/master/FAQ.md) and searched through the past issues both in the [original repo](https://github.com/alshedivat/al-folio/issues) and [this one](https://github.com/george-gca/multi-language-al-folio/issues), none of which addressed my issue.
25+
- label: I read through [FAQ](https://github.com/george-gca/multi-language-al-folio/blob/main/FAQ.md) and searched through the past issues both in the [original repo](https://github.com/alshedivat/al-folio/issues) and [this one](https://github.com/george-gca/multi-language-al-folio/issues), none of which addressed my issue.
2626
required: true
2727
- label: Yes, I have checked that this feature request isn't already filed.
2828
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ contact_links:
77
url: https://github.com/george-gca/multi-language-al-folio/discussions/categories/q-a
88
about: Ask and answer al-folio questions related to localization.
99
- name: 📖 Read the documentation
10-
url: https://github.com/george-gca/multi-language-al-folio/blob/master/README.md
10+
url: https://github.com/george-gca/multi-language-al-folio/blob/main/README.md
1111
about: Please consult the documentation before opening any issues!

.github/workflows/axe.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
}
4646
- name: Install and Build 🔧
4747
run: |
48+
sudo apt-get update && sudo apt-get install -y imagemagick
4849
pip3 install --upgrade jupyter
4950
export JEKYLL_ENV=production
5051
bundle exec jekyll build

.github/workflows/broken-links-site.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
}
3434
- name: Install and Build 🔧
3535
run: |
36+
sudo apt-get update && sudo apt-get install -y imagemagick
3637
pip3 install --upgrade jupyter
3738
export JEKYLL_ENV=production
3839
bundle exec jekyll build

.github/workflows/broken-links.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,11 @@ jobs:
4141
link-checker:
4242
runs-on: ubuntu-latest
4343
steps:
44-
- name: Checkout 🛎️
45-
uses: actions/checkout@v4
46-
with:
47-
ref: gca
44+
- uses: actions/checkout@v4
45+
4846
- name: Link Checker 🔗
49-
uses: lycheeverse/lychee-action@v1.9.0
47+
uses: lycheeverse/lychee-action@v2.1.0
5048
with:
5149
fail: true
5250
# removed md files that include liquid tags
53-
args: --user-agent 'curl/7.54' --exclude-path README.md --exclude-path _pages/en-us/404.md --exclude-path _pages/pt-br/404.md --exclude-path _pages/en-us/blog.md --exclude-path _pages/pt-br/blog.md --verbose --no-progress './**/*.md' './**/*.html'
51+
args: --user-agent 'curl/7.54' --exclude-path README.md --exclude-path _pages/en-us/404.md --exclude-path _pages/pt-br/404.md --exclude-path _pages/en-us/blog.md --exclude-path _pages/pt-br/blog.md --exclude-path _posts/en-us/2018-12-22-distill.md --exclude-path _posts/pt-br/2018-12-22-distill.md --exclude-path _posts/en-us/2023-04-24-videos.md --exclude-path _posts/pt-br/2023-04-24-videos.md --exclude-path _books/en-us/the_godfather.md --exclude-path _books/pt-br/the_godfather.md --verbose --no-progress './**/*.md' './**/*.html'

.github/workflows/codeql.yml

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL Advanced"
13+
14+
on:
15+
push:
16+
branches: ["main"]
17+
pull_request:
18+
branches: ["main"]
19+
schedule:
20+
- cron: "45 4 * * 3"
21+
22+
jobs:
23+
analyze:
24+
name: Analyze (${{ matrix.language }})
25+
# Runner size impacts CodeQL analysis time. To learn more, please see:
26+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
27+
# - https://gh.io/supported-runners-and-hardware-resources
28+
# - https://gh.io/using-larger-runners (GitHub.com only)
29+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
30+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
31+
permissions:
32+
# required for all workflows
33+
security-events: write
34+
35+
# required to fetch internal or private CodeQL packs
36+
packages: read
37+
38+
# only required for workflows in private repositories
39+
actions: read
40+
contents: read
41+
42+
strategy:
43+
fail-fast: false
44+
matrix:
45+
include:
46+
- language: javascript-typescript
47+
build-mode: none
48+
- language: ruby
49+
build-mode: none
50+
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
51+
# Use `c-cpp` to analyze code written in C, C++ or both
52+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
53+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
54+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
55+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
56+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
57+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
58+
steps:
59+
- name: Checkout repository
60+
uses: actions/checkout@v4
61+
62+
# Initializes the CodeQL tools for scanning.
63+
- name: Initialize CodeQL
64+
uses: github/codeql-action/init@v3
65+
with:
66+
languages: ${{ matrix.language }}
67+
build-mode: ${{ matrix.build-mode }}
68+
# If you wish to specify custom queries, you can do so here or in a config file.
69+
# By default, queries listed here will override any specified in a config file.
70+
# Prefix the list here with "+" to use these queries and those in the config file.
71+
72+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
73+
# queries: security-extended,security-and-quality
74+
75+
# If the analyze step fails for one of the languages you are analyzing with
76+
# "We were unable to automatically build your code", modify the matrix above
77+
# to set the build mode to "manual" for that language. Then modify this step
78+
# to build your code.
79+
# ℹ️ Command-line programs to run using the OS shell.
80+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
81+
- if: matrix.build-mode == 'manual'
82+
shell: bash
83+
run: |
84+
echo 'If you are using a "manual" build mode for one or more of the' \
85+
'languages you are analyzing, replace this with the commands to build' \
86+
'your code, for example:'
87+
echo ' make bootstrap'
88+
echo ' make release'
89+
exit 1
90+
91+
- name: Perform CodeQL Analysis
92+
uses: github/codeql-action/analyze@v3
93+
with:
94+
category: "/language:${{matrix.language}}"

.github/workflows/deploy.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- gca
77
paths:
88
- "assets/**"
9+
- "_sass/**"
910
- "**.bib"
1011
- "**.html"
1112
- "**.js"
@@ -32,6 +33,7 @@ on:
3233
- gca
3334
paths:
3435
- "assets/**"
36+
- "_sass/**"
3537
- "**.bib"
3638
- "**.html"
3739
- "**.js"
@@ -67,11 +69,16 @@ jobs:
6769
uses: actions/checkout@v4
6870
with:
6971
ref: gca
70-
- name: Setup Ruby
72+
- name: Setup Ruby 💎
7173
uses: ruby/setup-ruby@v1
7274
with:
73-
ruby-version: "3.2.2"
75+
ruby-version: "3.3.5"
7476
bundler-cache: true
77+
- name: Setup Python 🐍
78+
uses: actions/setup-python@v5
79+
with:
80+
python-version: "3.13"
81+
cache: "pip" # caching pip dependencies
7582
- name: Update _config.yml ⚙️
7683
uses: fjogeleit/yaml-update-action@main
7784
with:
@@ -81,7 +88,8 @@ jobs:
8188
value: ${{ github.repository }}
8289
- name: Install and Build 🔧
8390
run: |
84-
pip3 install --upgrade jupyter
91+
sudo apt-get update && sudo apt-get install -y imagemagick
92+
pip3 install --upgrade nbconvert
8593
export JEKYLL_ENV=production
8694
bundle exec jekyll build
8795
- name: Purge unused CSS 🧹

.github/workflows/schedule-posts.txt

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Publish posts scheduled for today
2+
3+
on:
4+
schedule:
5+
# Run every day at 23:30 UTC or manually run
6+
- cron: "30 23 * * *"
7+
workflow_dispatch:
8+
9+
jobs:
10+
publish_scheduled:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout main branch
14+
uses: actions/checkout@v4
15+
with:
16+
ref: main
17+
18+
- name: Get the date for today
19+
id: date
20+
run: echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
21+
22+
- name: Check for scheduled posts and move to posts
23+
run: |
24+
echo "Today is $TODAY"
25+
shopt -s nullglob
26+
for file in _scheduled/**/${TODAY}-*.md; do
27+
echo "Found scheduled: $file"
28+
parent_dir="$(dirname "$file")"
29+
language_dir="$(basename "$parent_dir")"
30+
mv "$file" "_posts/$language_dir/"
31+
echo "Moved $file to _posts/$language_dir/"
32+
done
33+
34+
- name: Commit and push changes
35+
run: |
36+
git config user.name "github-actions"
37+
git config user.email "[email protected]"
38+
git add _posts/
39+
git add _scheduled/
40+
git commit -m "Posted Scheduled Drafts on $TODAY" || echo "No changes to commit"
41+
git push

0 commit comments

Comments
 (0)