Skip to content

Commit 793ce56

Browse files
committed
deps: upgrade hugo and docsy
1 parent 599a878 commit 793ce56

29 files changed

+2128
-1622
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
HUGO_VERSION="0.107.0"
2-
DOCSY_VERSION="v0.6.0"
1+
HUGO_VERSION="0.133.1"
2+
DOCSY_VERSION="v0.11.0"

.github/workflows/gh-pages.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Add hugo nodejs dependencies
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: "18"
24+
node-version: "20"
2525
cache: 'npm'
2626

2727
- name: Setup Hugo
@@ -36,7 +36,8 @@ jobs:
3636
env:
3737
HUGO_ENV: "production"
3838
run: |
39-
yarn install
39+
npm install
40+
hugo mod get
4041
hugo --minify --gc
4142
4243
- name: Deploy to Pages

.github/workflows/run-htmltest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
env:
3737
HUGO_ENV: "production"
3838
run: |
39-
yarn install
39+
npm install
4040
hugo --minify --gc -d $GITHUB_WORKSPACE/dist
4141
- name: run htmltest
4242
continue-on-error: true
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Sync issue templates to content directory
2+
3+
on:
4+
push:
5+
paths:
6+
- '.github/ISSUE_TEMPLATE/**'
7+
- 'content/en/issue_templates/**'
8+
workflow_dispatch: # allow manual triggering
9+
10+
env:
11+
TEMPLATES_CONTENT_DIR: 'content/en/issue_templates'
12+
13+
jobs:
14+
sync:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout Repository
18+
uses: actions/checkout@v4
19+
with:
20+
token: ${{ secrets.GITHUB_TOKEN }}
21+
fetch-depth: 0
22+
23+
- name: Setup actions bot user
24+
run: |
25+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
26+
git config --global user.name "github-actions[bot]"
27+
28+
- name: Create target directory if it doesn't exist
29+
run: mkdir -p "${{ env.TEMPLATES_CONTENT_DIR }}"
30+
31+
- name: Sync Issue Templates
32+
run: |
33+
rsync -av --delete --exclude 'index.md' .github/ISSUE_TEMPLATE/ "${{ env.TEMPLATES_CONTENT_DIR }}/"
34+
if [[ -n $(git status --porcelain) ]]; then
35+
git add "${{ env.TEMPLATES_CONTENT_DIR }}"
36+
git commit -m "chore: sync issue templates"
37+
git push
38+
else
39+
echo "No changes to commit, templates are already in sync."
40+
fi

Dockerfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
ARG HUGO_VERSION=0.107.0
1+
ARG HUGO_VERSION=0.133.1
22
ARG DIST_TAG=-ext-ubuntu
3-
FROM klakegg/hugo:${HUGO_VERSION}${DIST_TAG}
3+
FROM floryn90/hugo:${HUGO_VERSION}${DIST_TAG}
44

5-
ARG DOCSY_VERSION=v0.6.0
5+
ARG DOCSY_VERSION=v0.11.0
66

77
LABEL maintainer="CoMSES Net <[email protected]>"
88

99
WORKDIR /src
10-
COPY config.toml package.json /src/
10+
COPY . /src/
1111

12-
RUN git config --global --add safe.directory /src \
13-
&& hugo mod init github.com/openmodelingfoundation/openmodelingfoundation.github.io \
14-
&& hugo mod get github.com/google/docsy@${DOCSY_VERSION}
12+
RUN git config --global --add safe.directory /src
1513

16-
COPY . /src/
14+
RUN hugo mod get
15+
RUN npm install
1716

1817
CMD ["server"]

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This GitHub pages site is generated with [hugo](https://gohugo.io) using the [do
1212

1313
### Setup
1414

15-
To create a local setup of this site you can install `Docker` and `docker-compose` or `hugo` and `yarn` on your local operating system.
15+
To create a local setup of this site you can install `Docker` and `docker-compose` or `hugo` and `npm` on your local operating system.
1616

1717
Clone this repository via `git clone --recurse-submodules -j8 https://github.com/openmodelingfoundation/openmodelingfoundation.github.io.git`
1818

@@ -31,17 +31,18 @@ Open a hugo shell in the docker container
3131
% make shell
3232
```
3333

34+
#### Install hugo and npm locally
3435

35-
36-
#### Install hugo and yarn locally
3736
If you don't have docker installed and don't mind installing things in your operating system, you can do the following:
3837

3938
- Install the extended version of hugo from the [releases page](https://github.com/gohugoio/hugo/releases).
40-
- Install yarn via your operating system's package manager or from the [yarn site](https://yarnpkg.com/getting-started/install).
41-
- Run `yarn install` in the base directory
42-
- Use hugo commands to render the site.
39+
- Install npm via your operating system's package manager or from the [npm site](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm).
40+
- Use hugo commands and npm to build/render the site.
4341

4442
```bash
43+
% hugo mod get
44+
% npm install
4545
% hugo serve # dev server without drafts
46+
# OR
4647
% hugo serve -D # dev server with drafts
4748
```

assets/scss/main.scss renamed to assets/scss/_styles_project.scss

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,5 @@
1-
@import "support/functions";
2-
@import "variables_project";
3-
@import "variables";
4-
@import "support/mixins";
5-
6-
@import "../vendor/bootstrap/scss/bootstrap";
7-
8-
@import "../vendor/Font-Awesome/scss/fontawesome.scss";
9-
@import "../vendor/Font-Awesome/scss/solid.scss";
10-
@import "../vendor/Font-Awesome/scss/brands.scss";
11-
12-
@import "support/utilities";
13-
@import "colors";
14-
@import "boxes";
15-
@import "blog";
16-
@import "code";
17-
@import "nav";
18-
@import "sidebar-tree";
19-
@import "sidebar-toc";
20-
@import "sidebar-tree-with-links";
21-
@import "buttons";
22-
@import "breadcrumb";
23-
@import "alerts";
24-
@import "content";
25-
@import "search";
26-
@import "main-container";
27-
@import "blocks/blocks";
28-
@import "section-index";
29-
@import "pageinfo";
30-
31-
@if $td-enable-google-fonts {
32-
@import url($web-font-path);
1+
a {
2+
text-decoration: none;
333
}
344

355
footer {
@@ -54,6 +24,22 @@ footer {
5424
}
5525
}
5626

27+
.person-entry {
28+
display: flex;
29+
30+
&__portrait {
31+
flex-shrink: 0;
32+
margin-right: 1.5rem;
33+
width: 200px;
34+
}
35+
36+
&__bio {
37+
flex-shrink: 1;
38+
margin-top: 1.5rem;
39+
max-width: 70%;
40+
}
41+
}
42+
5743
.td-toc a {
5844
font-size: 0.9rem;
5945
font-weight: normal;
@@ -114,5 +100,3 @@ footer {
114100
visibility: hidden;
115101
}
116102
}
117-
118-
@import "styles_project";

config.toml

Lines changed: 0 additions & 182 deletions
This file was deleted.

0 commit comments

Comments
 (0)