Skip to content

Commit 17a2f2c

Browse files
committed
Merge upstream
2 parents 56de0d7 + 4471315 commit 17a2f2c

30 files changed

+250
-77
lines changed

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set Hugo up
3030
uses: peaceiris/actions-hugo@v2
3131
with:
32-
hugo-version: '0.108.0'
32+
hugo-version: '0.119.0'
3333
extended: true # Prevent error building site: POSTCSS: failed to transform, see https://gohugo.io/troubleshooting/faq/#i-get-this-feature-is-not-available-in-your-current-hugo-version
3434

3535
- name: Clean public dir

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set Hugo up
2727
uses: peaceiris/actions-hugo@v2
2828
with:
29-
hugo-version: '0.108.0'
29+
hugo-version: '0.119.0'
3030
extended: true # Prevent error building site: POSTCSS: failed to transform, see https://gohugo.io/troubleshooting/faq/#i-get-this-feature-is-not-available-in-your-current-hugo-version
3131
- name: Build with Hugo
3232
run: hugo --minify

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Open Terms Archive documentation.
66

77
This website is built using [Hugo](https://gohugo.io), a static website editor, and uses [Node.js](https://nodejs.org).
88

9-
To build it, [install Hugo](https://gohugo.io/getting-started/installing/) and [Node.js](https://nodejs.org), and then:
9+
To build it, [install Hugo](https://gohugo.io/getting-started/installing/) (>= v0.114.0) and [Node.js](https://nodejs.org), and then:
1010

1111
```sh
1212
git clone https://github.com/OpenTermsArchive/docs
@@ -89,6 +89,12 @@ and run
8989
npm run test:links
9090
```
9191

92+
## Deployment
93+
94+
The `main` branch is used on production and automatically deployed through GitHub pages. Refer to the configuration file `.github/workflows/gh-pages.yml`.
95+
96+
For each pull request, a preview is automatically deployed through Netlify and a comment on the GitHub pull request display the necessary information, such as the preview URL. The configuration can be found in `netlify.toml` file.
97+
9298
- - -
9399

94100
## License

config/_default/config.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ baseURL: https://docs.opentermsarchive.org/
22
languageCode: en-us
33
title: Open Terms Archive documentation
44
theme: opentermsarchive
5+
disableKinds:
6+
- taxonomy
7+
ignoreErrors: ["error-disable-taxonomy"]

config/_default/menus.en.yaml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,37 @@ header:
22
- name: Home
33
url: https://opentermsarchive.org
44
weight: 1
5-
- name: Case studies
6-
url: https://opentermsarchive.org/case-studies
5+
- name: Datasets
6+
url: https://opentermsarchive.org/datasets
77
weight: 2
8-
- name: About
9-
url: https://opentermsarchive.org/about
10-
weight: 3
118
- name: Documentation
129
url: /
10+
weight: 3
11+
- name: Impact
12+
url: https://opentermsarchive.org/impact
1313
weight: 4
14+
- name: About
15+
url: https://opentermsarchive.org/about
16+
weight: 5
1417
footer:
1518
- name: Home
1619
url: https://opentermsarchive.org
1720
weight: 1
21+
- name: Datasets
22+
url: https://opentermsarchive.org/datasets
23+
weight: 2
1824
- name: Case studies
1925
url: https://opentermsarchive.org/case-studies
20-
weight: 2
21-
- name: About
22-
url: https://opentermsarchive.org/about
2326
weight: 3
2427
- name: Documentation
25-
url: https://docs.opentermsarchive.org
28+
url: /
2629
weight: 4
30+
- name: Impact
31+
url: https://opentermsarchive.org/impact
32+
weight: 5
33+
- name: About
34+
url: https://opentermsarchive.org/about
35+
weight: 6
2736
first_subfooter:
2837
- name: Statistics
2938
url: https://opentermsarchive.org/stats

config/_default/menus.fr.yaml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,37 @@ header:
22
- name: Accueil
33
url: https://opentermsarchive.org
44
weight: 1
5-
- name: Étude de cas
6-
url: https://opentermsarchive.org/fr/etudes-de-cas
5+
- name: Jeux de données
6+
url: https://opentermsarchive.org/fr/jeux-de-donnees
77
weight: 2
8-
- name: A propos
9-
url: https://opentermsarchive.org/fr/a-propos
10-
weight: 3
118
- name: Documentation
129
url: /fr
10+
weight: 3
11+
- name: Impact
12+
url: https://opentermsarchive.org/fr/impact
1313
weight: 4
14+
- name: À propos
15+
url: https://opentermsarchive.org/fr/a-propos
16+
weight: 5
1417
footer:
1518
- name: Accueil
1619
url: https://opentermsarchive.org
1720
weight: 1
21+
- name: Jeux de données
22+
url: https://opentermsarchive.org/fr/jeux-de-donnees
23+
weight: 2
1824
- name: Étude de cas
1925
url: https://opentermsarchive.org/fr/etudes-de-cas
20-
weight: 2
21-
- name: A propos
22-
url: https://opentermsarchive.org/fr/a-propos
2326
weight: 3
2427
- name: Documentation
25-
url: https://docs.opentermsarchive.org
28+
url: /fr
2629
weight: 4
30+
- name: Impact
31+
url: https://opentermsarchive.org/fr/impact
32+
weight: 5
33+
- name: À propos
34+
url: https://opentermsarchive.org/fr/a-propos
35+
weight: 6
2736
first_subfooter:
2837
- name: Statistiques
2938
url: https://opentermsarchive.org/fr/stats

content/_index.fr.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "Pour commencer"
3+
weight: 1
34
---
45

56
_La documentation en français n'est pas encore disponible. Vous pouvez toutefois la consulter en [langue anglaise]({{< relref path="/" lang="en" >}})._

content/contributing-terms.en.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "Contributing terms"
3+
weight: 2
34
---
45

56
# Contributing new declarations

content/design-principles.en.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "Design principles"
3+
weight: 3
34
---
45

56
# Design principles

content/governance.en.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "Governance"
3+
weight: 4
34
---
45

56
# Governance

0 commit comments

Comments
 (0)