Skip to content

Commit 7da25e4

Browse files
authored
Merge pull request #30 from cmbuckley/jekyll-upgrade
Convert to GitHub Actions deployment and Jekyll 4
2 parents 3605ceb + bc4b2df commit 7da25e4

File tree

3 files changed

+30
-48
lines changed

3 files changed

+30
-48
lines changed

.github/workflows/push.yml

Lines changed: 18 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ on:
55
pull_request:
66
branches: main
77

8+
permissions:
9+
contents: read
10+
pages: write
11+
id-token: write
12+
13+
concurrency:
14+
group: pages
15+
cancel-in-progress: false
16+
817
jobs:
918
commit_author:
1019
name: Get Commit Author
@@ -25,49 +34,15 @@ jobs:
2534
echo "email=$id+$name@users.noreply.github.com" >> $GITHUB_OUTPUT
2635
2736
build_assets:
28-
name: Build CV Assets
29-
runs-on: ubuntu-latest
30-
needs: commit_author
31-
steps:
32-
- name: Generate a token
33-
if: ${{ github.event_name == 'push' }}
34-
id: token
35-
uses: actions/create-github-app-token@v3
36-
with:
37-
app-id: ${{ vars.BUXBOT_APP_ID }}
38-
private-key: ${{ secrets.BUXBOT_PRIVATE_KEY }}
39-
40-
- name: Checkout repo
41-
uses: actions/checkout@v6
42-
with:
43-
# to ensure page_build workflow executes. Fallback for dependabot
44-
token: ${{ steps.token.outputs.token || github.token }}
45-
46-
- name: Install LaTeX packages
47-
run: |
48-
sudo apt-get update
49-
sudo apt-get install -y texlive-latex-base texlive-latex-recommended texlive-latex-extra aspell aspell-en
50-
51-
- name: Build assets
52-
run: make
53-
54-
- name: Spell check
55-
run: make spell
56-
57-
- name: Commit assets
58-
if: ${{ github.event_name == 'push' }}
59-
uses: stefanzweifel/git-auto-commit-action@v7
60-
with:
61-
add_options: --force
62-
file_pattern: chris-buckley-cv.pdf index.md
63-
skip_dirty_check: true
64-
skip_checkout: true
65-
commit_user_name: ${{ needs.commit_author.outputs.name }}
66-
commit_user_email: ${{ needs.commit_author.outputs.email }}
67-
commit_author: ${{ needs.commit_author.outputs.name_addr }}
68-
commit_message: Updated GitHub Pages
69-
branch: gh-pages
70-
push_options: --force
37+
uses: cmbuckley/.github/.github/workflows/pages.yml@main
38+
secrets: inherit
39+
with:
40+
deploy_enabled: ${{ github.event_name == 'push' }}
41+
custom_commands: |
42+
sudo apt-get update
43+
sudo apt-get install -y texlive-latex-base texlive-latex-recommended texlive-latex-extra aspell aspell-en
44+
make
45+
make spell
7146
7247
check_role:
7348
name: Check Role

Gemfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
source 'https://rubygems.org'
2+
ruby "~> 3.3"
3+
4+
gem 'jekyll', '~> 4.4'
5+
6+
# liquid former stdlibs
7+
gem 'base64'
8+
gem 'bigdecimal'
29

310
group :jekyll_plugins do
4-
gem 'github-pages'
11+
gem 'jekyll-github-metadata'
512
gem 'jekyll-remote-theme'
13+
gem 'jekyll-titles-from-headings'
614
end

assets/cv.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
---
3-
@import "config";
4-
@import "partials/mixins";
3+
@use "partials/mixins";
54

65
.cv .content {
76
.page__title {
@@ -32,7 +31,7 @@
3231
}
3332

3433
.download {
35-
@extend %screen-only;
34+
@include mixins.screen-only;
3635
text-align: center;
3736
}
3837

@@ -46,7 +45,7 @@
4645
margin-top: 0;
4746

4847
dt {
49-
@extend .sr-only;
48+
@include mixins.sr-only;
5049
}
5150

5251
dd {

0 commit comments

Comments
 (0)