Skip to content

Commit b69fe1f

Browse files
authored
Merge branch 'main' into docs/api-compatibility-review
2 parents b656a3c + 21a2507 commit b69fe1f

File tree

33 files changed

+2539
-41
lines changed

33 files changed

+2539
-41
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
* @nginxinc/nginx-gateway-fabric
2+
/site/ @nginxinc/nginx-gateway-fabric @nginxinc/nginx-docs
3+
/docs/ @nginxinc/nginx-gateway-fabric @nginxinc/nginx-docs

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3535

3636
- name: Setup Golang Environment
37-
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
37+
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3838
with:
3939
go-version-file: go.mod
4040

@@ -63,7 +63,7 @@ jobs:
6363
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6464

6565
- name: Setup Golang Environment
66-
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
66+
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
6767
with:
6868
go-version-file: go.mod
6969

@@ -105,7 +105,7 @@ jobs:
105105
fetch-depth: 0
106106

107107
- name: Setup Golang Environment
108-
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
108+
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
109109
with:
110110
go-version-file: go.mod
111111

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# queries: security-extended,security-and-quality
5656

5757
- name: Setup Golang Environment
58-
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
58+
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
5959
with:
6060
go-version-file: go.mod
6161
if: matrix.language == 'go'

.github/workflows/conformance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3737

3838
- name: Setup Golang Environment
39-
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
39+
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
4040
with:
4141
go-version-file: go.mod
4242

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2323

2424
- name: Setup Golang Environment
25-
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
25+
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2626
with:
2727
go-version-file: go.mod
2828

site/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ build-dev:
8989
hugo --gc -e development
9090

9191
deploy-preview: hugo-mod
92-
hugo --gc -b ${NETLIFY_DEPLOY_URL}
92+
hugo --gc -b ${NETLIFY_DEPLOY_URL}/nginx-gateway-fabric/

site/config/_default/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
title = "NGINX Gateway Fabric"
22
enableGitInfo = false
33
baseURL = "/"
4-
publishDir = "public/nginx-gateway-fabric"
54
staticDir = ["static"]
65
languageCode = "en-us"
76
description = "NGINX Gateway Fabric."

site/config/development/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
baseURL = "https://docs-dev.nginx.com/nginx-gateway-fabric"
22
title = "DEV -- NGINX Gateway Fabric"
3+
publishDir = "public/nginx-gateway-fabric"
34
canonifyURLs = false

site/config/production/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
baseURL = "/nginx-gateway-fabric"
22
title = "NGINX Gateway Fabric"
3+
publishDir = "public/nginx-gateway-fabric"
34
canonifyURLs = false

site/config/staging/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
baseURL = "https://docs-staging.nginx.com/nginx-gateway-fabric"
22
title = "STAGING -- NGINX Gateway Fabric"
3+
publishDir = "public/nginx-gateway-fabric"
34
canonifyURLs = false

0 commit comments

Comments
 (0)