Skip to content

Commit 38bca25

Browse files
authored
Merge pull request #78 from eclipse-leda/copilot/update-hugo-and-docsy
Update Hugo to 0.157.0 and Docsy to v0.14.3
2 parents 824f3d5 + 844ecad commit 38bca25

7 files changed

Lines changed: 649 additions & 1204 deletions

File tree

.github/workflows/ci.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,41 @@ jobs:
2525
name: Building documentation
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v4
29+
30+
- name: Setup Node.js
31+
uses: actions/setup-node@v4
32+
with:
33+
node-version: '22'
2934

3035
- name: Setup Hugo
31-
uses: peaceiris/actions-hugo@v2
36+
uses: peaceiris/actions-hugo@v3
3237
with:
33-
hugo-version: "0.110.0"
38+
hugo-version: "0.157.0"
3439
extended: true
3540

3641
- name: Download theme
3742
run: |
38-
git clone https://github.com/google/docsy.git themes/docsy
43+
git clone --branch v0.14.3 --depth 1 https://github.com/google/docsy.git themes/docsy
3944
40-
- name: Install theme
45+
- name: Install theme dependencies
4146
working-directory: ./themes/docsy
4247
run: |
43-
npm i
48+
npm ci
49+
50+
- name: Install build dependencies
51+
run: |
52+
npm ci
4453
4554
- name: Build
4655
run: |
47-
export NODE_PATH=$NODE_PATH:`npm root -g`
48-
npm i -g postcss postcss-cli autoprefixer
4956
echo "Build documentation for GitHub Pages"
5057
hugo
5158
5259
# only publish pages if it's the upstream
5360
- name: Publish to GH Pages
5461
if: github.repository_owner == 'eclipse-leda'
55-
uses: peaceiris/actions-gh-pages@v3
62+
uses: peaceiris/actions-gh-pages@v4
5663
with:
5764
github_token: ${{ secrets.GITHUB_TOKEN }}
5865
publish_dir: ./public

config.toml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,7 @@ pygmentsStyle = "tango"
5454
blog = "/:section/:year/:month/:day/:slug/"
5555

5656
## Configuration for BlackFriday markdown parser: https://github.com/russross/blackfriday
57-
[blackfriday]
58-
plainIDAnchors = true
59-
hrefTargetBlank = true
60-
angledQuotes = false
61-
latexDashes = true
62-
57+
# [blackfriday] is deprecated since Hugo 0.60 and removed in favor of Goldmark (see [markup] section)
6358
# Image processing configuration.
6459
[imaging]
6560
resampleFilter = "CatmullRom"
@@ -229,19 +224,13 @@ permalinkable = false
229224
[module]
230225
[module.hugoVersion]
231226
extended = true
232-
min = "0.73.0"
227+
min = "0.146.0"
233228
[[module.mounts]]
234229
source = 'content/en'
235230
target = 'content'
236231
[[module.mounts]]
237232
source = 'assets'
238233
target = 'assets'
239-
[[module.mounts]]
240-
source = 'node_modules/bootstrap'
241-
target = 'assets/vendor/bootstrap'
242-
[[module.mounts]]
243-
source = 'node_modules/@fortawesome/fontawesome-free'
244-
target = 'assets/vendor/Font-Awesome'
245234
[[module.mounts]]
246235
source = "i18n"
247236
target = "i18n"
@@ -255,7 +244,6 @@ min = "0.73.0"
255244
source = 'vss/output/Vehicle'
256245
lang = 'en'
257246
target = 'content/docs/vss/Vehicle'
258-
259247

260248
# https://www.docsy.dev/docs/adding-content/search/#algolia-docsearch
261249
#[params.search]

layouts/partials/footer.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</div>
2626
<div class="col-12 col-sm-4 text-center py-2 order-sm-2">
2727
{{ with .Site.Params.copyright }}<small class="text-white">&copy; {{ now.Year}} {{ .}}. {{ T "footer_all_rights_reserved" }}.</small>{{ end }}
28-
{{ with .Site.Params.privacy_policy }}<small class="ml-1"><a href="{{ . }}" target="_blank" rel="noopener">{{ T "footer_privacy_policy" }}</a></small>{{ end }}
28+
{{ with .Site.Params.privacy_policy }}<small class="ms-1"><a href="{{ . }}" target="_blank" rel="noopener">{{ T "footer_privacy_policy" }}</a></small>{{ end }}
2929
{{ if not .Site.Params.ui.footer_about_disable }}
3030
{{ with .Site.GetPage "about" }}<p class="mt-2"><a href="{{ .RelPermalink }}">{{ .Title }}</a></p>{{ end }}
3131
{{ end }}
@@ -44,7 +44,7 @@
4444
{{ define "footer-links-block" }}
4545
<ul class="list-inline mb-0">
4646
{{ range . }}
47-
<li class="list-inline-item mx-2 h3" data-toggle="tooltip" data-placement="top" title="{{ .name }}" aria-label="{{ .name }}">
47+
<li class="list-inline-item mx-2 h3" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ .name }}" aria-label="{{ .name }}">
4848
<a class="text-white" target="_blank" rel="noopener" href="{{ .url }}" aria-label="{{ .name }}">
4949
<i class="{{ .icon }}"></i>
5050
</a>

0 commit comments

Comments
 (0)