From 30f94848edb5e391925e8dda2efb4738dd83f0b2 Mon Sep 17 00:00:00 2001 From: Gavin Adams Date: Thu, 17 Aug 2023 15:39:03 -0600 Subject: [PATCH 1/3] test: build cmd --- src/Dockerfile | 2 +- src/make_hugo.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Dockerfile b/src/Dockerfile index 12082c2..73443c0 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -8,7 +8,7 @@ FROM public.ecr.aws/ubuntu/ubuntu:20.04_stable AS base ARG TARGETARCH ARG BUILDARCH -RUN echo "TARGETARCH=${TARGETARCH}\BUILDARCH=${BUILDARCH}" +RUN echo "TARGETARCH=${TARGETARCH}\nBUILDARCH=${BUILDARCH}" RUN [ ${TARGETARCH} = ${BUILDARCH} ] || { echo "Error: the target architecture is not the same as the build architecture"; exit 1; } diff --git a/src/make_hugo.sh b/src/make_hugo.sh index b668f13..17939cf 100755 --- a/src/make_hugo.sh +++ b/src/make_hugo.sh @@ -19,7 +19,7 @@ HELP_USAGE function build_docker_image { if ! [[ $(docker images -q $IMAGE_NAME) ]]; then echo "********** Building container image for Hugo and dependencies" - docker buildx -t $IMAGE_NAME --build-arg GOPROXY=$(go env GOPROXY) . + docker build -t $IMAGE_NAME --build-arg GOPROXY=$(go env GOPROXY) . fi } From c7a3a7656dfcc13114ff65f11e3261177828bbfc Mon Sep 17 00:00:00 2001 From: Gavin Adams Date: Mon, 26 Feb 2024 09:21:52 -0500 Subject: [PATCH 2/3] test: source fmt to test pipeline on PR --- src/docker_assets/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/docker_assets/config.go b/src/docker_assets/config.go index 9db2ed3..4923b32 100644 --- a/src/docker_assets/config.go +++ b/src/docker_assets/config.go @@ -30,7 +30,7 @@ var Default = Config{ Strikethrough: true, Linkify: true, TaskList: true, - Plantuml: true, + Plantuml: true, }, Renderer: Renderer{ Unsafe: false, @@ -95,4 +95,4 @@ type ParserAttribute struct { Title bool // Enables custom attributeds for blocks. Block bool -} \ No newline at end of file +} From 7e3a8e75240cd2a171dd24128695d755edd54384 Mon Sep 17 00:00:00 2001 From: Gavin Adams Date: Mon, 26 Feb 2024 09:43:59 -0500 Subject: [PATCH 3/3] fix: go formatting --- src/docker_assets/convert.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/docker_assets/convert.go b/src/docker_assets/convert.go index bc5982d..3ef612e 100644 --- a/src/docker_assets/convert.go +++ b/src/docker_assets/convert.go @@ -30,6 +30,7 @@ import ( "github.com/spf13/afero" + uml "github.com/OhYee/goldmark-plantuml" "github.com/gohugoio/hugo/hugofs" "github.com/gohugoio/hugo/markup/converter" "github.com/gohugoio/hugo/markup/highlight" @@ -42,7 +43,6 @@ import ( "github.com/yuin/goldmark/renderer/html" "github.com/yuin/goldmark/text" "github.com/yuin/goldmark/util" - uml "github.com/OhYee/goldmark-plantuml" ) // Provider is the package entry point. @@ -153,7 +153,6 @@ func newMarkdown(pcfg converter.ProviderConfig) goldmark.Markdown { extensions = append(extensions, uml.Default) } - md := goldmark.New( goldmark.WithExtensions( extensions..., @@ -361,4 +360,4 @@ func newHighlighting(cfg highlight.Config) goldmark.Extender { w.WriteString("") }), ) -} \ No newline at end of file +}