summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRutherther <rutherther@ditigal.xyz>2025-12-07 11:33:50 +0100
committerRutherther <rutherther@ditigal.xyz>2025-12-22 23:00:43 +0100
commit86a6006f41141fcd78cec25e31f93ea85e363c73 (patch)
tree3e235363fbb803bba59da4ac93cd61217acb7725
parent8ba84edf997a95726d2aa452b0c3e33e6c8a1262 (diff)
Split release Makefile target to two.
Due to recent changes, the commit has to be published to create the artifacts. Because of that, split the target to two. * Makefile.am (release): Move first steps to prepare-release (prepare-release): New target; Beginning of release. Change-Id: I325c6dc36f7298482de7797c1e01fdaa70ef80c5 Signed-off-by: Rutherther <rutherther@ditigal.xyz>
-rw-r--r--Makefile.am19
1 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 895465dc969..cca120baa1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1142,12 +1142,18 @@ system_flags = $(foreach system,$(1),-s $(system))
1142# 5. Build the installation and VM images. The images will run 'guix' 1142# 5. Build the installation and VM images. The images will run 'guix'
1143# corresponding to 'vX.Y.Z' + 1 commit, and they will install 'vX.Y.Z'. 1143# corresponding to 'vX.Y.Z' + 1 commit, and they will install 'vX.Y.Z'.
1144# 1144#
1145# This 'release' target takes care of everything and copies the resulting 1145# This is split into two targets, because a commit is made that has to be
1146# files to $(releasedir). 1146# pushed to Guix.
1147# First, 'prepare-release' should be run, doing steps 1 and 2.
1148# Then, the resulting commit should be pushed so that it's available
1149# to be downloaded for the system images.
1150# Afterwards, the 'release' target takes care of the rest. This 'release'
1151# target takes care of everything and copies the resulting files to
1152# $(releasedir).
1147# 1153#
1148# XXX: Depend on 'dist' rather than 'distcheck' to work around the Gettext 1154# XXX: Depend on 'dist' rather than 'distcheck' to work around the Gettext
1149# issue described at <https://savannah.gnu.org/bugs/index.php?51027>. 1155# issue described at <https://savannah.gnu.org/bugs/index.php?51027>.
1150release: dist-with-updated-version all 1156prepare-release: dist-with-updated-version all
1151 @if ! git diff-index --quiet HEAD; then \ 1157 @if ! git diff-index --quiet HEAD; then \
1152 echo "There are uncommitted changes; stopping." >&2 ; \ 1158 echo "There are uncommitted changes; stopping." >&2 ; \
1153 exit 1 ; \ 1159 exit 1 ; \
@@ -1165,6 +1171,13 @@ release: dist-with-updated-version all
1165 $(top_builddir)/pre-inst-env guix build guix \ 1171 $(top_builddir)/pre-inst-env guix build guix \
1166 $(call system_flags,$(SUPPORTED_SYSTEMS)) \ 1172 $(call system_flags,$(SUPPORTED_SYSTEMS)) \
1167 -v1 --no-grafts --fallback 1173 -v1 --no-grafts --fallback
1174
1175 @echo
1176 @echo "First step done! Source tarball is ready in $(releasedir)"
1177 @echo "Now push the resulting commit and run `make release`."
1178 @echo
1179
1180release: all
1168# Generate the binary release tarballs. 1181# Generate the binary release tarballs.
1169 rm -f $(BINARY_TARBALLS) 1182 rm -f $(BINARY_TARBALLS)
1170 $(MAKE) $(BINARY_TARBALLS) 1183 $(MAKE) $(BINARY_TARBALLS)