Skip to content

Move hugo and theme to latest #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ jobs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v3
with:
hugo-version: '0.97.3'
hugo-version: '0.148.2'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nuclearcat I am trying to update hugo, but the workflow stills shows:

Run peaceiris/actions-hugo@v3
Hugo version: 0.97.3

https://github.com/kernelci/kernelci-project/actions/runs/16916278037/job/47930853147#step:11:6

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might need to make it as branch on this repository, so i can test it in actions. I will try to do that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nuclearcat Not sure what branch is that you referring to. This PR here has all the changes we need. Maybe you can push it to a branch in the main repo?

extended: true

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'

- name: Install dependencies (postcss), bootstrap-sass
run: npm install --save-dev autoprefixer && npm install postcss-cli && npm install -D postcss && npm install -D postcss-preset-env && npm install -D bootstrap-sass
- name: Install NPM dependencies
run: cd kernelci.org && npm install

- name: Build staging
if: github.event.inputs.environment == 'staging' || github.event_name == 'issue_comment'
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "kernelci.org/themes/docsy"]
path = kernelci.org/themes/docsy
url = https://github.com/google/docsy.git
[submodule "kernelci.org/external/kernelci-core"]
path = kernelci.org/external/kernelci-core
url = https://github.com/kernelci/kernelci-core.git
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ $ cd kernelci.org

Then to start the server:
```sh
$ docker run -v $PWD:/src -p 1313:1313 klakegg/hugo:0.97.3-ext-debian server -D
$ docker run -v $PWD:/src -p 1313:1313 hugomods/hugo:exts-0.148.2 server -D
```

Note: The site now uses Hugo modules with Docsy v0.12.0. Hugo will automatically download the required modules on first run.

Alternatively, this can be started with `docker-compose`:

```sh
Expand Down
2 changes: 2 additions & 0 deletions kernelci.org/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
resources/_gen
public
node_modules/
.hugo_build.lock
14 changes: 12 additions & 2 deletions kernelci.org/config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
baseURL = "https://kernelci.org/"
theme = "docsy"

# -- languages --

Expand Down Expand Up @@ -51,7 +50,7 @@ sidebar_menu_compact = false
breadcrumb_disable = false
sidebar_search_disable = false
navbar_logo = true
footer_about_disable = false
footer_about_enable = true

[params.links]

Expand Down Expand Up @@ -105,3 +104,14 @@ footer_about_disable = false
name = "Documentation"
url = "/"
weight = 5

# -- Hugo modules configuration --

[module]
proxy = "direct"
[module.hugoVersion]
extended = true
min = "0.146.0"
[[module.imports]]
path = "github.com/google/docsy"
disable = false
4 changes: 2 additions & 2 deletions kernelci.org/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# 2)retrieve all lfs files with `git lfs pull`
# you might need to install git-lfs with `sudo apt install git-lfs`
# 3)run `docker-compose up` to start the server
# Note: The site uses Hugo modules - Hugo will automatically download required modules

version: '3'
services:
localhugo:
container_name: 'localhugo'
image: 'hubci/hugo:0.97.3'
image: 'hugomods/hugo:exts-0.148.2'
volumes:
- '.:/src'
ports:
Expand Down
5 changes: 5 additions & 0 deletions kernelci.org/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module kernelci.org

go 1.21

require github.com/google/docsy v0.12.0 // indirect
4 changes: 4 additions & 0 deletions kernelci.org/go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
github.com/google/docsy v0.12.0 h1:CddZKL39YyJzawr8GTVaakvcUTCJRAAYdz7W0qfZ2P4=
github.com/google/docsy v0.12.0/go.mod h1:1bioDqA493neyFesaTvQ9reV0V2vYy+xUAnlnz7+miM=
github.com/twbs/bootstrap v5.3.6+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
Loading