Skip to content

Commit 3fa192a

Browse files
committed
may 2024 update
1 parent 767a5c4 commit 3fa192a

File tree

3 files changed

+20
-36
lines changed

3 files changed

+20
-36
lines changed

.github/workflows/gem-push.yml

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,41 @@
1-
21
# This workflow uses actions that are not certified by GitHub.
32
# They are provided by a third-party and are governed by
43
# separate terms of service, privacy policy, and support
54
# documentation.
65
# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
76
# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
87

8+
99
name: Lab design website deploy handler
1010

1111
on:
1212
push:
13-
branches: [ master ]
13+
branches: [master]
1414

1515
jobs:
1616
build:
17-
name: Build + Publish
1817
runs-on: ubuntu-latest
19-
18+
2019
steps:
2120
- uses: actions/checkout@v2
21+
22+
- name: Set up Ruby
23+
uses: ruby/setup-ruby@v1
2224
with:
23-
persist-credentials: false
24-
fetch-depth: 0
25-
- name: Set up Ruby 2.6
26-
uses: actions/setup-ruby@v1
27-
with:
28-
ruby-version: 2.6.x
25+
ruby-version: '3.1'
2926

30-
- name: Build Jekyll site
27+
- name: Install dependencies
3128
run: |
32-
set -xo pipefail
33-
rm -rf _site/*
3429
gem install bundler
3530
bundle install
36-
bundle exec jekyll build
37-
cp CNAME _site/CNAME
38-
39-
- name: Commit files
40-
env:
41-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
42-
run: |
43-
set -xo pipefail
44-
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
45-
git config --local user.name "github-actions[bot]"
46-
git checkout master
47-
ls -Q | grep -v _site | xargs rm -rf
48-
mv _site/* .
49-
rm -rf _site
50-
[[ -n "$(git status --porcelain)" ]] || exit 0
51-
git add .
52-
git commit -m "Build $(git rev-parse source | grep -o '^.\{10\}')"
53-
- name: Push changes
54-
uses: ad-m/github-push-action@master
31+
32+
- name: Build the site
33+
run: bundle exec jekyll build
34+
35+
- name: Deploy to GitHub Pages
36+
uses: peaceiris/actions-gh-pages@v3
5537
with:
5638
github_token: ${{ secrets.GITHUB_TOKEN }}
57-
branch: ${{ github.ref }}
58-
force: true
39+
publish_dir: ./_site
40+
enable_jekyll: true
41+
cname: lab-design.github.io

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ group :jekyll_plugins do
2121
gem "jekyll-paginate"
2222
gem 'html-proofer', '3.4'
2323
gem 'jekyll-scholar'
24+
gem 'faraday-retry'
2425
end

_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ scholar:
5656
# Plugins
5757
plugins:
5858
- jekyll-paginate
59-
- jekyll/scholar
59+
- jekyll-scholar
6060

6161
whitelist:
6262
- jekyll-paginate
63-
- jekyll/scholar
63+
- jekyll-scholar

0 commit comments

Comments
 (0)