Commit f53fad46 authored by Nico's avatar Nico

fix failing build because of BUILD_DATE var name collision

parent b27bcb21
Pipeline #332 passed with stages
in 281 minutes and 34 seconds
......@@ -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:
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment