diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml index c272c3d7f..d46e669c9 100644 --- a/.github/workflows/deploy-gh-pages.yml +++ b/.github/workflows/deploy-gh-pages.yml @@ -10,22 +10,22 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout (tutorials) - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: submodules: true # Fetch Hugo themes (true OR recursive) fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod - name: Checkout (theme) - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: - repository: MunifTanjim/minimo - ref: v2.9.0 + repository: falkmielke/minimo + ref: update_202605 path: themes/minimo - name: Setup Hugo - uses: peaceiris/actions-hugo@v2 + uses: peaceiris/actions-hugo@32c7754570a8edd0ae33352fae4a8448f23858e9 #v3.1.0 with: - hugo-version: '0.88.1' + hugo-version: '0.161.1' # extended: true - name: Build @@ -39,7 +39,7 @@ jobs: run: node themes/minimo/scripts/generate-search-index-lunr.js - name: Deploy 🚀 - uses: JamesIves/github-pages-deploy-action@4.0.0 + uses: JamesIves/github-pages-deploy-action@d92aa235d04922e8f08b40ce78cc5442fcfbfa2f #v4.8.0 with: branch: gh-pages folder: public diff --git a/.github/workflows/generate-artifact-pr.yml b/.github/workflows/generate-artifact-pr.yml index b7b5bb2ac..eb8ccb421 100644 --- a/.github/workflows/generate-artifact-pr.yml +++ b/.github/workflows/generate-artifact-pr.yml @@ -8,23 +8,23 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout (tutorials) - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: ref: ${{ github.event.pull_request.head.sha }} submodules: true # Fetch Hugo themes (true OR recursive) fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod - name: Checkout (theme) - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: - repository: MunifTanjim/minimo - ref: v2.9.0 + repository: falkmielke/minimo + ref: update_202605 path: themes/minimo - name: Setup Hugo - uses: peaceiris/actions-hugo@v2 + uses: peaceiris/actions-hugo@32c7754570a8edd0ae33352fae4a8448f23858e9 #v3.1.0 with: - hugo-version: '0.88.1' + hugo-version: '0.161.1' # extended: true - name: Build @@ -38,7 +38,7 @@ jobs: run: node themes/minimo/scripts/generate-search-index-lunr.js - name: Archive built site to an artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: pr-${{ env.PR_NUMBER }}-inbo-tutorials-website path: public diff --git a/.github/workflows/remove_old_artifact.yaml b/.github/workflows/remove_old_artifact.yaml index d4a765c54..259679e98 100644 --- a/.github/workflows/remove_old_artifact.yaml +++ b/.github/workflows/remove_old_artifact.yaml @@ -12,7 +12,7 @@ jobs: steps: - name: Remove old artifacts - uses: c-hive/gha-remove-artifacts@v1 + uses: c-hive/gha-remove-artifacts@44fc7acaf1b3d0987da0e8d4707a989d80e9554b #v1.4.0 with: age: '1 days' skip-recent: 5 diff --git a/README.md b/README.md index 1ebd7f1ac..e0c0f15e8 100644 --- a/README.md +++ b/README.md @@ -26,11 +26,17 @@ The technology used to create the website is [Hugo](https://gohugo.io/), a stati 1. [Install hugo](https://gohugo.io/getting-started/installing/) 2. Clone the tutorials repository -3. In the cloned tutorials directory, install the theme with `git clone https://github.com/MunifTanjim/minimo.git --branch v2.9.0 themes/minimo` -4. Build and serve the site with `hugo server` +3. In the cloned tutorials directory, install the theme[^1] with `git clone https://github.com/MunifTanjim/minimo.git themes/minimo` +4. Build and serve the site + a) with `hugo server` OR + b) for debugging, with `hugo -D` and then serving manually `python -m http.server 8887 --bind localhost --directory /public/` + +[^1]: The `minimo` theme seems unmaintained; a (temporary?) fork with fixes of hugo deprecation warnings is available [here](https://github.com/falkmielke/minimo/tree/update_202605). + For more information, see [Hugo's getting started documentation](https://gohugo.io/getting-started/usage/). + ### Customizing the theme The tutorials website makes use of the Hugo theme [minimo](https://themes.gohugo.io/minimo/). This theme is not included in the repository, but [downloaded by GitHub pages](https://github.com/inbo/tutorials/blob/262f305ef66fd4fc46ef7b2a9dce36cd2ad3e0d9/.github/workflows/deploy-gh-pages.yml#L18-L23) at build time. This avoids clutter and changes to the theme itself. To customize the theme: @@ -48,4 +54,4 @@ For more information, see the [Hugo theme customization documentation](https://g ## License -[Creative Commons Attribution](https://creativecommons.org/licenses/by/4.0/) for [content](content) / [MIT License](https://github.com/inbo/tutorials/blob/master/LICENSE) for source code. \ No newline at end of file +[Creative Commons Attribution](https://creativecommons.org/licenses/by/4.0/) for [content](content) / [MIT License](https://github.com/inbo/tutorials/blob/master/LICENSE) for source code. diff --git a/config.toml b/config.toml index ff520a925..84d992c53 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,5 @@ theme = "minimo" -languageCode = "en-us" +locale = "en-us" title = "INBO Tutorials" ignoreFiles = ["\\.Rmd$", "\\.Rmarkdown$", "\\.qmd$", "_cache$", "\\.db$", "\\.csv$", "\\.sqlite$", "\\.geojson$"] @@ -12,7 +12,7 @@ copyright = "" disqusShortname = "" googleAnalytics = "" -Paginate = 1000 +pagination.pagerSize = 1000 preserveTaxonomyNames = true enableRobotsTXT = true # generate robots.txt @@ -146,7 +146,7 @@ hrefTargetBlank = true # edit this block for your own language [languages.en] lang = "en" -languageName = "English" +label = "English" weight = 1 [markup] diff --git a/layouts/partials/entry/meta/edit-page.html b/layouts/partials/entry/meta/edit-page.html index 7ebc3e2d2..476d85f79 100644 --- a/layouts/partials/entry/meta/edit-page.html +++ b/layouts/partials/entry/meta/edit-page.html @@ -11,7 +11,7 @@ {{ end }} {{ with .Site.Params.githublink.GithubEditLink }} - {{- partial "svg/icons" "github" -}} Improve this page + {{- partial "svg/icon" "github" -}} Improve this page {{ end }} {{ end }} diff --git a/layouts/partials/widgets/recent_posts.html b/layouts/partials/widgets/recent_posts.html index 686dc3506..f7780c6fb 100644 --- a/layouts/partials/widgets/recent_posts.html +++ b/layouts/partials/widgets/recent_posts.html @@ -1,5 +1,5 @@ -{{- $defaultConfig := .Site.Data.config.default.widgets.recent_posts -}} -{{- $configData := ( or .Site.Data.config.widgets.recent_posts $defaultConfig ) -}} +{{- $defaultConfig := hugo.Data.config.default.widgets.recent_posts -}} +{{- $configData := ( or hugo.Data.config.widgets.recent_posts $defaultConfig ) -}} {{- $lang := .Site.Language.Lang -}} {{- $config := ( ( index $configData $lang ) | default $configData ) -}}