From fe6b76832c6c88861ddb93effe74bceaa3219787 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 27 Aug 2025 11:15:09 -0400 Subject: [PATCH 1/8] Adventurous xgettext-go automation --- .drone.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.drone.yml b/.drone.yml index d5d9809d..c5b53234 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,6 +19,25 @@ steps: depends_on: - make check + - name: xgettext-go + image: git.coopcloud.tech/toolshed/drone-xgettext-go:latest + settings: + keyword: i18n.G + out: pkg/i18n/locales/abra.pot + depends_on: + - make test + + - name: xgettext-go status + image: alpine:3.22 + commands: + - apk add patchutils git make + - cd /drone/src + - sed -i "s/charset=CHARSET/charset=UTF-8/g" pkg/i18n/locales/abra.pot + - git diff pkg/i18n/locales/abra.pot | grepdiff --output-matching=hunk POT-Creation-Date | git apply --reverse + - git diff-index --quiet --cached HEAD -- + depends_on: + - xgettext-go + - name: fetch image: docker:git commands: @@ -26,6 +45,7 @@ steps: depends_on: - make check - make test + - xgettext-go status when: event: tag @@ -60,6 +80,7 @@ steps: depends_on: - make check - make test + - xgettext-go status - name: on-demand integration test image: appleboy/drone-ssh -- 2.49.0 From 0f0700e56c0ce5d28caf7df4d77922c531273786 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 27 Aug 2025 11:21:23 -0400 Subject: [PATCH 2/8] Move check-pot-changes to Makefile --- .drone.yml | 4 +--- Makefile | 7 ++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index c5b53234..ae9d3c26 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,9 +32,7 @@ steps: commands: - apk add patchutils git make - cd /drone/src - - sed -i "s/charset=CHARSET/charset=UTF-8/g" pkg/i18n/locales/abra.pot - - git diff pkg/i18n/locales/abra.pot | grepdiff --output-matching=hunk POT-Creation-Date | git apply --reverse - - git diff-index --quiet --cached HEAD -- + - make update-pot-metadata check-pot-changes depends_on: - xgettext-go diff --git a/Makefile b/Makefile index f7051d70..25a8394a 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,12 @@ update-pot: .PHONY: update-pot-po-metadata update-pot-po-metadata: - @sed -i "s/charset=CHARSET/charset=UTF-8/g" pkg/i18n/locales/*.po* + @sed -i "s/charset=CHARSET/charset=UTF-8/g" pkg/i18n/locales/*.po pkg/i18n/locales/*.pot* + +.PHONY: check-pot-changes +check-pot-changes: + @git diff pkg/i18n/locales/abra.pot | grepdiff --output-matching=hunk POT-Creation-Date | git apply --reverse + @git diff-index --quiet --cached HEAD -- .PHONY: build-mo build-mo: -- 2.49.0 From 86e81dd7d067c81f6cf5b2ab0eb7ca6c30ee4db4 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 27 Aug 2025 11:24:02 -0400 Subject: [PATCH 3/8] Fix makefile command for `xgettext-go status` build step --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ae9d3c26..f9b59b9b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,7 +32,7 @@ steps: commands: - apk add patchutils git make - cd /drone/src - - make update-pot-metadata check-pot-changes + - make update-pot-po-metadata check-pot-changes depends_on: - xgettext-go -- 2.49.0 From 437fab307babf4c86794a6dc987a1b0e0fa60548 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 27 Aug 2025 11:26:36 -0400 Subject: [PATCH 4/8] Fix check-pot-changes makefile command --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 25a8394a..5e19be85 100644 --- a/Makefile +++ b/Makefile @@ -88,8 +88,8 @@ update-pot-po-metadata: .PHONY: check-pot-changes check-pot-changes: - @git diff pkg/i18n/locales/abra.pot | grepdiff --output-matching=hunk POT-Creation-Date | git apply --reverse - @git diff-index --quiet --cached HEAD -- + @git diff pkg/i18n/locales/abra.pot | grepdiff --output-matching=hunk POT-Creation-Date | git apply --reverse --allow-empty + @git diff-files --quiet .PHONY: build-mo build-mo: -- 2.49.0 From 6dcd070165b8a8cbd93b8b93b7a49e71c9e8dc99 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 27 Aug 2025 11:27:13 -0400 Subject: [PATCH 5/8] Tiny tweak to test Drone explosion --- cli/app/labels.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/app/labels.go b/cli/app/labels.go index 43017377..e59dcea6 100644 --- a/cli/app/labels.go +++ b/cli/app/labels.go @@ -24,7 +24,7 @@ var AppLabelsCommand = &cobra.Command{ Aliases: []string{i18n.G("lb")}, Short: i18n.G("Show deployment labels"), Long: i18n.G("Both local recipe and live deployment labels are shown."), - Example: i18n.G(" abra app labels 1312.net"), + Example: " " + i18n.G("abra app labels 1312.net"), Args: cobra.ExactArgs(1), ValidArgsFunction: func( cmd *cobra.Command, -- 2.49.0 From cc90adc2d9b854982d05e882c9ca2f4d12f58a83 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 27 Aug 2025 11:31:05 -0400 Subject: [PATCH 6/8] Tweak Drone order, switch image for xgettext-go --- .drone.yml | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index f9b59b9b..46ddb5bf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,23 @@ steps: commands: - make check + - name: xgettext-go + image: git.coopcloud.tech/toolshed/drone-xgettext-go:latest + settings: + keyword: i18n.G + out: pkg/i18n/locales/abra.pot + depends_on: + - make check + + - name: xgettext-go status + image: golang:1.26.0-alpine3.22 + commands: + - apk add patchutils git make + - cd /drone/src + - make update-pot-po-metadata check-pot-changes + depends_on: + - xgettext-go + - name: make test image: golang:1.24 environment: @@ -19,23 +36,6 @@ steps: depends_on: - make check - - name: xgettext-go - image: git.coopcloud.tech/toolshed/drone-xgettext-go:latest - settings: - keyword: i18n.G - out: pkg/i18n/locales/abra.pot - depends_on: - - make test - - - name: xgettext-go status - image: alpine:3.22 - commands: - - apk add patchutils git make - - cd /drone/src - - make update-pot-po-metadata check-pot-changes - depends_on: - - xgettext-go - - name: fetch image: docker:git commands: @@ -43,7 +43,6 @@ steps: depends_on: - make check - make test - - xgettext-go status when: event: tag @@ -78,7 +77,6 @@ steps: depends_on: - make check - make test - - xgettext-go status - name: on-demand integration test image: appleboy/drone-ssh -- 2.49.0 From d974bd03a75c13a5039bf823970cecbda60cd221 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 27 Aug 2025 11:35:52 -0400 Subject: [PATCH 7/8] Fix golang image tag --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 46ddb5bf..e8158701 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ steps: - make check - name: xgettext-go status - image: golang:1.26.0-alpine3.22 + image: golang:1.24-alpine3.22 commands: - apk add patchutils git make - cd /drone/src -- 2.49.0 From 6422d3034b75f7fc013d89b1e5ff779dcd78ab11 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 27 Aug 2025 11:43:16 -0400 Subject: [PATCH 8/8] Update check-pot-changes --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5e19be85..7f5064c7 100644 --- a/Makefile +++ b/Makefile @@ -88,8 +88,11 @@ update-pot-po-metadata: .PHONY: check-pot-changes check-pot-changes: - @git diff pkg/i18n/locales/abra.pot | grepdiff --output-matching=hunk POT-Creation-Date | git apply --reverse --allow-empty - @git diff-files --quiet + @git diff pkg/i18n/locales/abra.pot | grepdiff --output-matching=hunk POT-Creation-Date | git apply --reverse --allow-empty + @if ! git diff-files --quiet; then \ + git diff pkg/i18n/locales/abra.pot; \ + exit 1; \ + fi .PHONY: build-mo build-mo: -- 2.49.0