From 0e300f487d457cd19ec631f2340ee793432e7122 Mon Sep 17 00:00:00 2001 From: Philipp Stadler <hello@phstadler.com> Date: Fri, 12 Jul 2024 19:25:10 +0200 Subject: [PATCH] chore: add custom release dir stem and fix git reset --- Makefile | 8 ++++++-- build.sha | 2 +- version.txt | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 version.txt diff --git a/Makefile b/Makefile index e05152b..c6ba506 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,8 @@ +export RELEASE_DIR_STEM := sinologie-1 +export VERSION := $(file < version.txt) export CONTENT_DIR := $(PWD)/content +# overrides the target of all git commands in this make and the the submake, +# with the effect that changelogs are about the parent repo export GIT_DIR := $(PWD)/.git .PHONY: apkg @@ -14,10 +18,10 @@ clean: test -d build && $(MAKE) -C build clean || true .PHONY: deepclean -deepclean: clean +deepclean: rm -rf build build: build.git build.sha -rm -rf build git clone $(file < build.git) build - cd build && git reset --hard $(file < build.sha) + cd build && GIT_DIR=$(PWD)/build/.git git reset --hard $(file < build.sha) diff --git a/build.sha b/build.sha index defa8cd..2be3c4b 100644 --- a/build.sha +++ b/build.sha @@ -1 +1 @@ -2545166f5b28ef1cec879639d4a40e3aca1e614f +af48aa155e789bece5c5d87cbf269fc9233f09dc diff --git a/version.txt b/version.txt new file mode 100644 index 0000000..3eefcb9 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +1.0.0 -- GitLab