anton/fix-gpg-key-id #33

Manually merged
lrvick merged 2 commits from anton/fix-gpg-key-id into main 2025-02-10 06:29:29 +00:00
2 changed files with 8 additions and 6 deletions

View File

@ -1,17 +1,19 @@
VERSION := development VERSION := development
GIT_REF := $(shell git log -1 --format=%H) GIT_REF := $(shell git log -1 --format=%H)
GIT_AUTHOR := $(shell git log -1 --format=%an) GIT_AUTHOR := $(shell git log -1 --format=%an)
GIT_PUBKEY := $(shell git log -1 --format=%GP) GIT_PUBKEY := $(shell git log -1 --format=%GK)
GIT_TIMESTAMP := $(shell git log -1 --format=%cd --date=iso) GIT_TIMESTAMP := $(shell git log -1 --format=%cd --date=iso)
export export
## Use env vars from latest release when reproducing ## Use env vars from latest release when reproducing
ifdef REPRODUCE ifdef REPRODUCE
include dist/release.env include dist/release.env
export export
endif endif
## Prevents use of caching when building docker image
ifdef NOCACHE ifdef NOCACHE
NO_CACHE := --no-cache NO_CACHE := --no-cache
endif endif
.DEFAULT_GOAL := .DEFAULT_GOAL :=
@ -71,7 +73,7 @@ vm: out/dev-shell.digest out/airgap.iso out/sdcard.img
-nographic; \ -nographic; \
" "
## Signing, Verification, and Release Targets ## Release, Signing, Verification, and Reproduction Targets
.PHONY: clean .PHONY: clean
clean: clean:

View File

@ -57,7 +57,7 @@ make release
### Reproduce an existing release ### Reproduce an existing release
``` ```
make attest make reproduce
``` ```
### Sign an existing release ### Sign an existing release