From 13de4de62cbf34adc8eb801be5246350962f86b7 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Wed, 01 Jul 2026 07:47:04 +0000 Subject: [PATCH] .tangled/workflows: fix nix builds for blog avatars render correctly now Signed-off-by: oppiliappan --- .tangled/workflows/deploy-blog.yml | 31 +++---------------------------- blog/templates/index.html | 5 ++++- nix/pkgs/blog.nix | 4 +++- 3 file(s) changed, 10 insertion(s)(+), 30 deletion(s)(-) diff --git a/.tangled/workflows/deploy-blog.yml b/.tangled/workflows/deploy-blog.yml --- a/.tangled/workflows/deploy-blog.yml +++ b/.tangled/workflows/deploy-blog.yml @@ -9,38 +9,13 @@ engine: microvm image: nixos dependencies: - - go - - gcc - nodejs - - tailwindcss steps: - - name: patch static dir - command: | - mkdir -p appview/pages/static/logos - - - name: build dolly + - name: build blog command: | - go build -o dolly.out ./cmd/dolly - - - name: generate favicons - command: | - ./dolly.out -template appview/pages/templates/fragments/dolly -output appview/pages/static/logos/dolly.png -size 180 - ./dolly.out -template appview/pages/templates/fragments/dolly -output appview/pages/static/logos/dolly.ico -size 48 - ./dolly.out -template appview/pages/templates/fragments/dolly -output appview/pages/static/logos/dolly.svg -color currentColor -favicon - - - name: generate css - command: | - tailwindcss -i input.css -o appview/pages/static/tw.css - - - name: build blog cmd - command: | - go build -o blog.out ./cmd/blog - - - name: build static site - command: | - ./blog.out build + nix build .#blog --impure - name: deploy command: | - npx --yes wrangler pages deploy --branch master --project-name tangled-blog ./build + npx --yes wrangler pages deploy --branch master --project-name tangled-blog ./result diff --git a/blog/templates/index.html b/blog/templates/index.html --- a/blog/templates/index.html +++ b/blog/templates/index.html @@ -66,11 +66,14 @@ {{ if .Meta.Draft }}[draft]{{ end }}
+ {{ $hasAvatar := false }}{{ range .Meta.Authors }}{{ if tinyAvatar .Handle }}{{ $hasAvatar = true }}{{ end }}{{ end }} + {{ if $hasAvatar }}
{{ range .Meta.Authors }} - {{ .Name }} + {{ $av := tinyAvatar .Handle }}{{ if $av }}{{ .Name }}{{ end }} {{ end }}
+ {{ end }}
{{ $date := .ParsedDate }}{{ $date | shortTimeFmt }}
diff --git a/nix/pkgs/blog.nix b/nix/pkgs/blog.nix --- a/nix/pkgs/blog.nix +++ b/nix/pkgs/blog.nix @@ -27,7 +27,9 @@ env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib"; CGO_ENABLED = 1; }; in - runCommandLocal "blog" {} '' + runCommandLocal "blog" { + TANGLED_AVATAR_SHARED_SECRET = builtins.getEnv "TANGLED_AVATAR_SHARED_SECRET"; + } '' mkdir -p working cp -r --no-preserve=mode ${src}/blog working/ cp -r --no-preserve=mode ${src}/appview working/ -- tangled.sh