unkin/packer-images
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: multiple fixes #3

Merged
unkinben merged 1 commits from neoloc/fix_consul_commits into master 2025-01-12 16:48:47 +11:00
Conversation 0 Commits 1 Files Changed 2 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -7,7 +7,7 @@ SYMLINK_PREFIX := library_
REGISTRY := git.query.consul REGISTRY := git.query.consul
OWNER := unkin OWNER := unkin
DATE_TAG := $(shell date +%Y%m%d) DATE_TAG := $(shell date +%Y%m%d)
SUFFIX=$(shell basename $(mktemp -u) | cut -d . -f 2) SUFFIX=$(shell basename $$(mktemp -u) | cut -d . -f 2)
GIT_BRANCH=$(shell git branch --show-current) GIT_BRANCH=$(shell git branch --show-current)
GIT_COMMIT := $(shell git rev-parse --short HEAD) GIT_COMMIT := $(shell git rev-parse --short HEAD)
@ -82,7 +82,7 @@ $(DIRS):
packer build . ) packer build . )
# Update build timestamp and date in Consul if on master branch # Update build timestamp and date in Consul if on master branch
@if [ "$(BRANCH)" = "master" ]; then \ @if [ "$(GIT_BRANCH)" = "master" ]; then \
echo "Current branch is $(GIT_BRANCH), updating consul."; \ echo "Current branch is $(GIT_BRANCH), updating consul."; \
CURRENT_TIMESTAMP=$$(date +%s); \ CURRENT_TIMESTAMP=$$(date +%s); \
READABLE_DATE=$$(date '+%Y-%m-%d %H:%M:%S %Z'); \ READABLE_DATE=$$(date '+%Y-%m-%d %H:%M:%S %Z'); \

2
ci/build.sh
View File

@ -9,7 +9,7 @@ images_changes=$(git diff --name-only master | grep -E '^images/')
# Run `make all` if there are changes in builds/ # Run `make all` if there are changes in builds/
if [ -n "$builds_changes" ]; then if [ -n "$builds_changes" ]; then
echo "Changes detected in builds/. Running 'make build-all'..." echo "Changes detected in builds/. Running 'make build-all'..."
make build-all make all
fi fi
# Run specific `make` commands for each changed file in images/ # Run specific `make` commands for each changed file in images/