From f53fad46fac52fa4ab65de0a3344f4d872859285 Mon Sep 17 00:00:00 2001
From: nrb <freifunk@nicoboehr.de>
Date: Sat, 29 Feb 2020 12:13:07 +0100
Subject: [PATCH] fix failing build because of BUILD_DATE var name collision
---
.gitlab-ci.yml | 4 ++--
site.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03c7906bf..1002c0042 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 e5d179809..a07654391 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
--
GitLab