Skip to content

Commit 1d7c8e9

Browse files
committed
Merge remote-tracking branch 'upstream/main' into update-from-al-folio
2 parents 84f62b7 + 58f4e02 commit 1d7c8e9

File tree

149 files changed

+26896
-44258
lines changed

Some content is hidden

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

149 files changed

+26896
-44258
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: 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. 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).
1414
@@ -20,7 +20,7 @@ body:
2020
Please check if somebody else has already filed the same issue.
2121
If you find a similar issue, please add a 👍 reaction or comment on the original post.
2222
options:
23-
- label: I read through [FAQ](https://github.com/alshedivat/al-folio/blob/master/FAQ.md) and searched through the [past issues](https://github.com/alshedivat/al-folio/issues), none of which addressed my issue.
23+
- label: I read through [FAQ](https://github.com/alshedivat/al-folio/blob/main/FAQ.md) and searched through the [past issues](https://github.com/alshedivat/al-folio/issues), none of which addressed my issue.
2424
required: true
2525
- label: Yes, I have checked that this issue isn't already filed.
2626
required: true

.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).
1414
@@ -20,7 +20,7 @@ body:
2020
Please check if somebody else has already filed the same 🚀 feature request.
2121
If you find a similar feature request, please add a 👍 reaction or comment on the original post.
2222
options:
23-
- label: I read through [FAQ](https://github.com/alshedivat/al-folio/blob/master/FAQ.md) and searched through the [past issues](https://github.com/alshedivat/al-folio/issues), none of which addressed my feature request.
23+
- label: I read through [FAQ](https://github.com/alshedivat/al-folio/blob/main/FAQ.md) and searched through the [past issues](https://github.com/alshedivat/al-folio/issues), none of which addressed my feature request.
2424
required: true
2525
- label: Yes, I have checked that this feature request isn't already filed.
2626
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ contact_links:
44
url: https://github.com/alshedivat/al-folio/discussions/categories/q-a
55
about: Ask and answer al-folio related questions.
66
- name: 📖 Read the documentation
7-
url: https://github.com/alshedivat/al-folio/blob/master/README.md
7+
url: https://github.com/alshedivat/al-folio/blob/main/README.md
88
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
@@ -43,6 +43,7 @@ jobs:
4343
}
4444
- name: Install and Build 🔧
4545
run: |
46+
sudo apt-get update && sudo apt-get install -y imagemagick
4647
pip3 install --upgrade jupyter
4748
export JEKYLL_ENV=production
4849
bundle exec jekyll build

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

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

.github/workflows/broken-links.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@ on:
4141
jobs:
4242
link-checker:
4343
runs-on: ubuntu-latest
44+
# only run on the main repo
45+
if: github.repository == 'alshedivat/al-folio'
4446
steps:
4547
- uses: actions/checkout@v4
4648

4749
- name: Link Checker 🔗
48-
uses: lycheeverse/lychee-action@v1.9.0
50+
uses: lycheeverse/lychee-action@v2.1.0
4951
with:
5052
fail: true
5153
# removed md files that include liquid tags
52-
args: --user-agent 'curl/7.54' --exclude-path README.md --exclude-path _pages/404.md --exclude-path _pages/blog.md --exclude-path _posts/2018-12-22-distill.md --exclude-path _posts/2023-04-24-videos.md --verbose --no-progress './**/*.md' './**/*.html'
54+
args: --user-agent 'curl/7.54' --exclude-path README.md --exclude-path _pages/404.md --exclude-path _pages/blog.md --exclude-path _posts/2018-12-22-distill.md --exclude-path _posts/2023-04-24-videos.md --exclude-path _books/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: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
- main
88
paths:
99
- "assets/**"
10+
- "_sass/**"
11+
- "_scripts/**"
1012
- "**.bib"
1113
- "**.html"
1214
- "**.js"
@@ -34,6 +36,8 @@ on:
3436
- main
3537
paths:
3638
- "assets/**"
39+
- "_sass/**"
40+
- "_scripts/**"
3741
- "**.bib"
3842
- "**.html"
3943
- "**.js"
@@ -67,11 +71,16 @@ jobs:
6771
steps:
6872
- name: Checkout 🛎️
6973
uses: actions/checkout@v4
70-
- name: Setup Ruby
74+
- name: Setup Ruby 💎
7175
uses: ruby/setup-ruby@v1
7276
with:
73-
ruby-version: "3.2.2"
77+
ruby-version: "3.3.5"
7478
bundler-cache: true
79+
- name: Setup Python 🐍
80+
uses: actions/setup-python@v5
81+
with:
82+
python-version: "3.13"
83+
cache: "pip" # caching pip dependencies
7584
- name: Update _config.yml ⚙️
7685
uses: fjogeleit/yaml-update-action@main
7786
with:
@@ -81,7 +90,8 @@ jobs:
8190
value: ${{ github.repository }}
8291
- name: Install and Build 🔧
8392
run: |
84-
pip3 install --upgrade jupyter
93+
sudo apt-get update && sudo apt-get install -y imagemagick
94+
pip3 install --upgrade nbconvert
8595
export JEKYLL_ENV=production
8696
bundle exec jekyll build
8797
- name: Purge unused CSS 🧹

.github/workflows/schedule-posts.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout main branch
1414
uses: actions/checkout@v4
1515
with:
16-
ref: master
16+
ref: main
1717

1818
- name: Get the date for today
1919
id: date

0 commit comments

Comments
 (0)