From 3a64e23583595a923676fc06276601d552bb9efa Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Tue, 28 Mar 2023 11:45:25 +0200 Subject: [PATCH] Or get the branch? --- .woodpecker.yml | 3 +++ Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ac61bfe0..8c96fd07 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,4 +7,7 @@ pipeline: - apt-get update - apt-get install -y hunspell hunspell-fr-comprehensive - python3 -m pip install -r requirements.txt + - BRANCH="$(grep ^BRANCH Makefile | awk '{print $3}')" + - git fetch origin --no-tags +refs/heads/$BRANCH + - git branch $BRANCH origin/$BRANCH - make verifs diff --git a/Makefile b/Makefile index 752cbc87..5689df8c 100644 --- a/Makefile +++ b/Makefile @@ -140,7 +140,7 @@ wrap: ensure_test_prerequisites @echo "Re wrapping modified files" powrap -m -SRCS = $(shell git diff --name-only $(BRANCH) 2>/dev/null | grep '.po$$' || echo *.po */*.po) +SRCS = $(shell git diff --name-only $(BRANCH) | grep '.po$$') # foo/bar.po => $(POSPELL_TMP_DIR)/foo/bar.po.out DESTS = $(addprefix $(POSPELL_TMP_DIR)/,$(addsuffix .out,$(SRCS)))