Skip to content

Commit

Permalink
site ci: retrieve tags from directory of Makefile
Browse files Browse the repository at this point in the history
Retrieve the git tag relative to the directory the Makefile invokes the
git command. Previously, the directory git was working in was the one of
the root Makefile. When invoked from Gluon directly without using the CI
tooling, the tag retrieved would be obtained from the Gluon tree, not
the site tree.

Fixes: d8b10353b6c8 ("site ci: retrieve tags from directory of Makefile")

Signed-off-by: David Bauer <[email protected]>
(cherry picked from commit e5abde5)
  • Loading branch information
blocktrron committed Jun 11, 2024
1 parent 2fe5f5e commit 417b50c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion site.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FFDA_SITE_VERSION := $(shell git describe --tags --abbrev=0 | sed 's/-.*//')
FFDA_SITE_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
FFDA_SITE_VERSION := $(shell git -C $(FFDA_SITE_DIR) describe --tags --abbrev=0 | sed 's/-.*//')

DEFAULT_GLUON_RELEASE := $(FFDA_SITE_VERSION)~$(shell date '+%Y%m%d')
DEFAULT_GLUON_PRIORITY := 0
Expand Down

0 comments on commit 417b50c

Please sign in to comment.