aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2021-08-18 04:01:41 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2022-03-30 01:06:20 +0200
commit39aa8bb2cf0d25fa176db51a0288e1736068fdf0 (patch)
treee4432c74a6639e854893480328852957edae13a3
parenta8b95ad2c780fb51fd76244c0c08a751e1579b14 (diff)
downloadmatterbridge-39aa8bb2cf0d25fa176db51a0288e1736068fdf0.tar.gz
matterbridge-39aa8bb2cf0d25fa176db51a0288e1736068fdf0.tar.bz2
matterbridge-39aa8bb2cf0d25fa176db51a0288e1736068fdf0.zip
Workaround guix bug #49801
In order to be reproducible we need to use guix time-machine. This is because the generated provenance file is different between the master branch HEAD at a given time, and the exact same commit given to guix time-machine. The latest commit touching the generation of the matterbridge.tar.xz file in this git repository is the commit 0fae9a5e9b5acac1b2ea28a9e5e77efadf0dbddc (Makefile: matterbridge.tar.xz fix various issues). It was made the Mon Jun 7 2021. So we used the hash of the Guix commit 855805aadef94285ea38aad62d528995655e17e7 (gnu: Add emacs-ytel) as it was made on the same day to have some approximate functional equivalent of the matterbridge.tar.xz that is deployed on the VM. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--Makefile15
1 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 828a3ae..f2e1e62 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+GUIX_COMMIT ?= 855805aadef94285ea38aad62d528995655e17e7
.PHONY: all matterbridge.tar.xz sync test
all: help
@@ -23,11 +24,15 @@ help:
matterbridge.tar.xz:
rm -f $@
rm -f matterbridge.tar
- cp `guix pack \
- --save-provenance -RR \
- --compression=xz \
- matterbridge \
- --symlink=/usr/bin/matterbridge=bin/matterbridge` $@
+ cp `guix time-machine \
+ --branch=master \
+ --commit=$(GUIX_COMMIT) \
+ -- \
+ pack \
+ --save-provenance -RR \
+ --compression=xz \
+ matterbridge \
+ --symlink=/usr/bin/matterbridge=bin/matterbridge` $@
unxz $@
chmod +w matterbridge.tar
tar -rf matterbridge.tar \