Skip to content

Commit 9b313df

Browse files
committed
guix: Ensure EPOCH_SOURCE_DATE does not include GPG information
If the user has set log.showSignature=true in their git config, then the git log will always output GPG signature information. Since git log is used to set EPOCH_SOURCE_DATE, this will mistakenly have GPG signature information in it which causes issues for the build. To avoid this issue, we override the config and force log.showSignature=false.
1 parent 43225f0 commit 9b313df

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

contrib/guix/guix-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ host_to_commonname() {
232232
}
233233

234234
# Determine the reference time used for determinism (overridable by environment)
235-
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}"
235+
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --format=%at -1)}"
236236

237237
# Execute "$@" in a pinned, possibly older version of Guix, for reproducibility
238238
# across time.

contrib/guix/guix-codesign

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ fi
220220
JOBS="${JOBS:-$(nproc)}"
221221

222222
# Determine the reference time used for determinism (overridable by environment)
223-
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}"
223+
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --format=%at -1)}"
224224

225225
# Execute "$@" in a pinned, possibly older version of Guix, for reproducibility
226226
# across time.

0 commit comments

Comments
 (0)