fix inherit repository

projectcapsule · Oct 15, 2023 · 1458231 · 1458231
1 parent b5bed46
commit 1458231
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -53,7 +53,7 @@ jobs:
           signature-repository: ghcr.io/${{ github.repository_owner }}/signatures
           main-path: ./
         env:
-          REGISTRY: ${GITHUB_REPOSITORY}
+          REPOSITORY: ${{ github.repository }}
   generate-capsule-provenance:
     needs: publish-images
     permissions:

diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ GIT_MODIFIED_1  ?= $(shell git diff $(GIT_HEAD_COMMIT) $(GIT_TAG_COMMIT) --quiet
 GIT_MODIFIED_2  ?= $(shell git diff --quiet && echo "" || echo ".dirty")
 GIT_MODIFIED    ?= $(shell echo "$(GIT_MODIFIED_1)$(GIT_MODIFIED_2)")
 GIT_REPO        ?= $(shell git config --get remote.origin.url)
-BUILD_DATE      ?= $(shell git log -1 --format="%at" | xargs -I{} date -r {} +%Y-%m-%dT%H:%M:%S)
+BUILD_DATE      ?= $(shell git log -1 --format="%at" | xargs -I{} sh -c 'if [ "$(shell uname)" = "Darwin" ]; then date -r {} +%Y-%m-%dT%H:%M:%S; else date -d @{} +%Y-%m-%dT%H:%M:%S; fi')
 IMG_BASE        ?= $(REPOSITORY)/capsule
 IMG             ?= $(IMG_BASE):$(VERSION)
 CAPSULE_IMG     ?= $(REGISTRY)/$(IMG_BASE)