diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 718fb33b..3c609c98 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -50,6 +50,8 @@ jobs: uses: actions/configure-pages@v5 - name: Install Node.js dependencies run: "npm ci" + - name: Configure Hugo resource Cache + run: "echo 'resourceDir: ${{ runner.temp }}/resources_cache' >> hugo.yaml" - name: Build with Hugo env: HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1cb2c9b4..5ab6f9b3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,7 +28,3 @@ repos: - id: end-of-file-fixer - id: fix-byte-order-marker - id: trailing-whitespace - - repo: https://github.com/rhysd/actionlint - rev: v1.7.7 - hooks: - - id: actionlint-docker diff --git a/content/news/2/image.webp b/content/news/2/image.webp index 8a7db2a8..370c0827 100644 Binary files a/content/news/2/image.webp and b/content/news/2/image.webp differ diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 5a2d5ff7..60dbfb80 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -7,7 +7,7 @@ {{ partial "head.html" . }} - +
{{ block "main" . }}{{ end }}
{{ if and (eq .Kind "page") (or (eq .Page.Type "country") (eq .Page.Type "operator")) }} diff --git a/layouts/country/list.html b/layouts/country/list.html index 2df04703..f6fcf47b 100644 --- a/layouts/country/list.html +++ b/layouts/country/list.html @@ -8,7 +8,7 @@

{{ .Title }}

{{ $object := replace .Path (printf "/%s/" .Page.Type) "" }} {{ $image := resources.Get (printf "images/flags/%s.webp" $object) }} - {{ partial "image.html" $image }} + {{ partialCached "image.html" $image $image }}
{{ .Title }} diff --git a/layouts/partials/teaser.html b/layouts/partials/teaser.html index 1c1d7be5..9958f4d2 100644 --- a/layouts/partials/teaser.html +++ b/layouts/partials/teaser.html @@ -8,8 +8,10 @@ {{ $image := $page.Page.Resources.GetMatch "image.webp" }} + {{ if $image }}
- {{ partial "image.html" $image }} + {{ partialCached "image.html" $image $image }} + {{ end }}
diff --git a/netlify.toml b/netlify.toml index f5001f8a..68469507 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,5 +1,5 @@ [build] - command = "hugo --gc --minify -b $DEPLOY_PRIME_URL && npx -y pagefind --site public" + command = "echo 'resourceDir: /opt/build/cache/resources_cache' >> hugo.yaml && hugo --gc --minify -b $DEPLOY_PRIME_URL && npx -y pagefind --site public" publish = "public" [build.environment]