diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03c7906bfcc753cf0f458c13b682e1c7de09e5db..1002c00421242da5c81e265f710ba9f4b5b27b7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +21,8 @@ generate_date: .target: stage: build script: - - make -C gluon update GLUON_SITEDIR="$CI_PROJECT_DIR" BUILD_DATE=$(cat build.date) - - make -C gluon GLUON_SITEDIR="$CI_PROJECT_DIR" GLUON_TARGET="$GLUON_TARGET" GLUON_BRANCH=stable BUILD_DATE=$(cat build.date) V=1 -j`nproc` + - make -C gluon update GLUON_SITEDIR="$CI_PROJECT_DIR" FFS_BUILD_DATE=$(cat build.date) + - make -C gluon GLUON_SITEDIR="$CI_PROJECT_DIR" GLUON_TARGET="$GLUON_TARGET" GLUON_BRANCH=stable FFS_BUILD_DATE=$(cat build.date) V=1 -j`nproc` except: - tags artifacts: diff --git a/site.mk b/site.mk index e5d179809c308cc282d2f834a6fa82779de87cd4..a076543914766fcaaeacd11d39622940b17ce5ae 100644 --- a/site.mk +++ b/site.mk @@ -81,9 +81,9 @@ endif DEFAULT_BUILD_DATE := $(shell date '+%Y-%m-%d') -BUILD_DATE ?= $(DEFAULT_BUILD_DATE) +FFS_BUILD_DATE ?= $(DEFAULT_BUILD_DATE) -DEFAULT_GLUON_RELEASE := 1.9+$(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 := 1.9+$(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