Skip to content

Commit df3072f

Browse files
authored
Share non-caching config across sites (#1230)
* Share non-caching config across sites Previously some sites had config and others didn't, and none of them disabled getremote caching for production. This meant that things like PR lists may be stale, subject to hugo's default getremote caching. It also meant that changing this was a bit whack-a-mole across the sites. This changes every site to symlink in the same config (so we can centrally edit all sites), to disable caching for getremote in production, and to actually use the production config when deploying. * Delete accidentally committed binary file * Add program checking all sites are consistent * Add missing deploy-netlify.sh files * Check site consistency in GitHub Action * Move all config to a shared dir, and add netlify.toml * Actually use deploy-netlify.sh for all sites
1 parent bad59a5 commit df3072f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+148
-149
lines changed

Diff for: .github/workflows/check-consistency.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ jobs:
1414
with:
1515
go-version: 1.21
1616
- name: Build tooling
17-
run: (cd tooling/go && go build ./cmd/local-overrides-enforcer && go build ./cmd/sprint-consistency)
17+
run: (cd tooling/go && go build ./cmd/local-overrides-enforcer && go build ./cmd/sprint-consistency && go build ./cmd/site-consistency)
1818
- name: Check override consistency
1919
run: ./tooling/go/local-overrides-enforcer
2020
- name: Check sprint consistency
2121
# TODO: The Launch should probably have themes, but for now we'll ignore it so we can be checking the rest of the repo without having to fix this.
2222
run: ./tooling/go/sprint-consistency --exclude-roots org-cyf-launch
23+
- name: Check site consistency
24+
run: ./tooling/go/site-consistency

Diff for: common-content/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: common-content/deploy-netlify.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../deploy-netlify.sh
1+
../tooling/common-config/deploy-netlify.sh

Diff for: common-content/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: common-docs/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: common-docs/deploy-netlify.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/deploy-netlify.sh

Diff for: common-docs/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: common-theme/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: common-theme/deploy-netlify.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../deploy-netlify.sh
1+
../tooling/common-config/deploy-netlify.sh

Diff for: common-theme/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: org-cyf-guides/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: org-cyf-guides/deploy-netlify.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../deploy-netlify.sh
1+
../tooling/common-config/deploy-netlify.sh

Diff for: org-cyf-guides/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: org-cyf-how-this-works/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: org-cyf-how-this-works/deploy-netlify.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/deploy-netlify.sh

Diff for: org-cyf-how-this-works/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: org-cyf-itd/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: org-cyf-itd/deploy-netlify.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/deploy-netlify.sh

Diff for: org-cyf-itd/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: org-cyf-itp/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: org-cyf-itp/config/production/config.toml

-1
This file was deleted.

Diff for: org-cyf-itp/deploy-netlify.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../deploy-netlify.sh
1+
../tooling/common-config/deploy-netlify.sh

Diff for: org-cyf-itp/netlify.toml

-19
This file was deleted.

Diff for: org-cyf-itp/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: org-cyf-launch/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: org-cyf-launch/deploy-netlify.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../deploy-netlify.sh
1+
../tooling/common-config/deploy-netlify.sh

Diff for: org-cyf-launch/netlify.toml

-14
This file was deleted.

Diff for: org-cyf-launch/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: org-cyf-piscine/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: org-cyf-piscine/deploy-netlify.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../deploy-netlify.sh
1+
../tooling/common-config/deploy-netlify.sh

Diff for: org-cyf-piscine/netlify.toml

-14
This file was deleted.

Diff for: org-cyf-piscine/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: org-cyf-sdc/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: org-cyf-sdc/config/development/config.toml

-15
This file was deleted.

Diff for: org-cyf-sdc/config/production/config.toml

-1
This file was deleted.

Diff for: org-cyf-sdc/deploy-netlify.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../deploy-netlify.sh
1+
../tooling/common-config/deploy-netlify.sh

Diff for: org-cyf-sdc/netlify.toml

-14
This file was deleted.

Diff for: org-cyf-sdc/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: org-cyf-theme/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: org-cyf-theme/config/development/config.toml

-15
This file was deleted.

Diff for: org-cyf-theme/config/production/config.toml

-1
This file was deleted.

Diff for: org-cyf-theme/deploy-netlify.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/deploy-netlify.sh

Diff for: org-cyf-theme/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: org-cyf-tracks/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: org-cyf-tracks/config/development/config.toml

-15
This file was deleted.

Diff for: org-cyf-tracks/config/production/config.toml

-1
This file was deleted.

Diff for: org-cyf-tracks/deploy-netlify.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../deploy-netlify.sh
1+
../tooling/common-config/deploy-netlify.sh

Diff for: org-cyf-tracks/netlify.toml

-14
This file was deleted.

Diff for: org-cyf-tracks/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: org-cyf/config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/config

Diff for: org-cyf/deploy-netlify.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../deploy-netlify.sh
1+
../tooling/common-config/deploy-netlify.sh

Diff for: org-cyf/netlify.toml

-14
This file was deleted.

Diff for: org-cyf/netlify.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../tooling/common-config/netlify.toml

Diff for: tooling/common-config/config/production/config.toml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# This config is for any production only settings
2+
3+
[caches.getresource]
4+
maxAge = "0m"

Diff for: deploy-netlify.sh renamed to tooling/common-config/deploy-netlify.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22

33
set -euo pipefail
44

5+
npm install --legacy-peer-deps
6+
57
# We set --baseURL on netlify so that any references to .Permalink end up pointing at deploy preview pages, rather than being hard-coded to point at the production URLs.
6-
hugo --minify --baseURL $DEPLOY_PRIME_URL && npx pagefind --site "public"
8+
hugo --minify --environment production --baseURL $DEPLOY_PRIME_URL && npx pagefind --site "public"

Diff for: tooling/common-config/netlify.toml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[build]
2+
ignore = "exit 1" #always build on PR even if you can't detect changes in this folder
3+
publish = "public"
4+
command = "./deploy-netlify.sh"
5+
[dev]
6+
framework = "hugo"
7+
targetPort = 3000
8+
command = "hugo server -p 3000"
9+
[[redirects]]
10+
from = "/api/*"
11+
to = "/.netlify/functions/:splat"
12+
status = 200
13+
[functions]
14+
external_node_modules = ["node-fetch"]
15+
16+
[[headers]]
17+
for = "/dummy-apis/*"
18+
[headers.values]
19+
Access-Control-Allow-Origin = "*"

0 commit comments

Comments
 (0)