Skip to content

Commit fd2dbcf

Browse files
authored
Merge pull request #20584 from dvdksn/housekeeping
hugo/build/ci housekeeping
2 parents 04bcc07 + ee6ebcb commit fd2dbcf

File tree

10 files changed

+40
-35
lines changed

10 files changed

+40
-35
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ jobs:
5656
- test
5757
- unused-media
5858
- test-go-redirects
59+
- dockerfile-lint
60+
- path-warnings
5961
steps:
6062
-
6163
name: Checkout

Dockerfile

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# syntax=docker/dockerfile-upstream:master
2+
# check=skip=InvalidBaseImagePlatform
23

34
# ALPINE_VERSION sets the Alpine Linux version for all Alpine stages
45
ARG ALPINE_VERSION=3.20
@@ -20,7 +21,7 @@ RUN npm install
2021

2122
# hugo downloads and extracts the Hugo binary
2223
FROM base AS hugo
23-
ARG HUGO_VERSION=0.127.0
24+
ARG HUGO_VERSION=0.132.0
2425
ARG TARGETARCH
2526
WORKDIR /tmp/hugo
2627
RUN wget -O "hugo.tar.gz" "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${TARGETARCH}.tar.gz"
@@ -44,7 +45,7 @@ ARG DOCS_URL
4445
RUN hugo --gc --minify -d /out -e $HUGO_ENV -b $DOCS_URL
4546

4647
# lint lints markdown files
47-
FROM davidanson/markdownlint-cli2:v0.12.1 AS lint
48+
FROM davidanson/markdownlint-cli2:v0.13.0 AS lint
4849
USER root
4950
RUN --mount=type=bind,target=. \
5051
/usr/local/bin/markdownlint-cli2 \
@@ -108,6 +109,18 @@ set -ex
108109
./scripts/test_unused_media.sh
109110
EOT
110111

112+
# path-warnings checks for duplicate target paths
113+
FROM build-base AS path-warnings
114+
RUN hugo --printPathWarnings > /path-warnings.txt
115+
RUN <<EOT
116+
DUPLICATE_TARGETS=$(grep "Duplicate target paths" /path-warnings.txt)
117+
if [ ! -z "$DUPLICATE_TARGETS" ]; then
118+
echo "$DUPLICATE_TARGETS"
119+
echo "You probably have a duplicate alias defined. Please check your aliases."
120+
exit 1
121+
fi
122+
EOT
123+
111124
# pagefind installs the Pagefind runtime
112125
FROM base AS pagefind
113126
ARG PAGEFIND_VERSION=1.1.0

content/engine/logging/configure.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ aliases:
99
- /engine/admin/reference/logging/
1010
- /engine/admin/logging/logentries/
1111
- /engine/admin/logging/overview/
12-
- /engine/admin/logging/
1312
- /config/containers/logging/configure/
1413
---
1514

content/security/for-admins/enforce-sign-in/_index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ toc_max: 2
44
keywords: authentication, registry.json, configure, enforce sign-in, docker desktop, security,
55
title: Enforce sign-in for Docker Desktop
66
aliases:
7-
- /docker-hub/configure-sign-in/
87
- /security/for-admins/configure-sign-in/
98
---
109

@@ -42,4 +41,4 @@ following occurs:
4241
> This means that your users must use SSO to sign in, instead of a username and password.
4342
> When you enforce sign-in and enforce SSO, your users must sign in and must use SSO to do so.
4443
> See [Enforce SSO](/security/for-admins/single-sign-on/connect#optional-enforce-sso) for details on how to enable this for your SSO connection.
45-
{ .tip }
44+
{ .tip }

docker-bake.hcl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ target "release" {
3232
}
3333

3434
group "validate" {
35-
targets = ["lint", "test", "unused-media", "test-go-redirects"]
35+
targets = ["lint", "test", "unused-media", "test-go-redirects", "dockerfile-lint", "path-warnings"]
3636
}
3737

3838
target "test" {
@@ -59,6 +59,15 @@ target "test-go-redirects" {
5959
provenance = false
6060
}
6161

62+
target "dockerfile-lint" {
63+
call = "check"
64+
}
65+
66+
target "path-warnings" {
67+
target = "path-warnings"
68+
output = ["type=cacheonly"]
69+
}
70+
6271
#
6372
# releaser targets are defined in _releaser/Dockerfile
6473
# and are used for AWS S3 deployment

layouts/_default/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h1 data-pagefind-weight="10" class="scroll-mt-36">{{ . }}</h1>
1212
{{ partial "guides-stepper.html" . }}
1313
{{ end }}
1414
<div class="block lg:hidden">
15-
{{ partial "pagemeta.html" . }}
15+
{{ partialCached "pagemeta.html" . . }}
1616
<hr>
1717
</div>
1818
{{ .Content }}

layouts/partials/aside.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<aside class="py-4 space-y-4">
22
{{ partial "github-links.html" . }}
33
<div id="TableOfContents">
4-
{{ partial "pagemeta.html" . }}
4+
{{ partialCached "pagemeta.html" . . }}
55
</div>
66
</aside>

layouts/shortcodes/build-feature-state.html

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

layouts/shortcodes/introduced.html

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,16 @@
4141
{{ end }}
4242
{{ end }}
4343
{{- if $versionAboveThreshold }}
44-
<div class="text-gray-light dark:text-gray-dark flex items-center gap-2">
45-
<span class="icon-svg flex items-center">{{ partial "icon.html" "chevron_right" }}</span>
46-
<span>Introduced in {{ T $component }} version
47-
{{- if $link }}
48-
{{ page.RenderString (fmt.Printf `[%s](%s)` $v $link) }}
49-
{{- else }}
50-
{{ $v }}
51-
{{- end }}
52-
</span>
53-
</div>
54-
{{- else }}
55-
{{ warnf "[introduced] version below threshold: %s %s %v" $component $v $pos }}
44+
<div class="text-gray-light dark:text-gray-dark flex items-center gap-2">
45+
<span class="icon-svg flex items-center">{{ partialCached "icon.html" "chevron_right" "chevron_right" }}</span>
46+
<span>Introduced in {{ T $component }} version
47+
{{- if $link }}
48+
{{ page.RenderString (fmt.Printf `[%s](%s)` $v $link) }}
49+
{{- else }}
50+
{{ $v }}
51+
{{- end }}
52+
</span>
53+
</div>
5654
{{- end }}
5755
{{- else }}
5856
{{ errorf "[introduced] invalid component: %s %v" $component $pos }}

layouts/shortcodes/siblings.html

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

0 commit comments

Comments
 (0)