diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df11745ea32f9953235298f7c0a09e8948d73e48..75685900396d4bef23915dab7ac07c04941bdfe3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ stages: default: before_script: + - git submodule foreach 'git fetch --tags' - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) - ssh-add <(echo "$GIT_SSH_PRIV_KEY") diff --git a/site.mk b/site.mk index c44537e621dfb0444c89456aa9e463f96f74b27b..2d675329b56f275c1c4dd55b5114b41aa81ffefb 100644 --- a/site.mk +++ b/site.mk @@ -85,7 +85,7 @@ DEFAULT_BUILD_DATE := $(shell date '+%Y-%m-%d') FFS_BUILD_DATE ?= $(DEFAULT_BUILD_DATE) -DEFAULT_GLUON_RELEASE := 2.3+$(FFS_BUILD_DATE)-g.$(shell git -C $(GLUON_SITEDIR)/gluon log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUON_SITEDIR) log --pretty=format:'%h' -n 1) +DEFAULT_GLUON_RELEASE := 2.4+$(FFS_BUILD_DATE)-g.$(shell git -C $(GLUON_SITEDIR)/gluon log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUON_SITEDIR) log --pretty=format:'%h' -n 1) GLUON_LANGS := de en