Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
firmware
FFS Gluon site
Commits
f53fad46
Commit
f53fad46
authored
Feb 29, 2020
by
Nico
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix failing build because of BUILD_DATE var name collision
parent
b27bcb21
Pipeline
#332
passed with stages
in 281 minutes and 34 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
.gitlab-ci.yml
.gitlab-ci.yml
+2
-2
site.mk
site.mk
+2
-2
No files found.
.gitlab-ci.yml
View file @
f53fad46
...
...
@@ -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
:
...
...
site.mk
View file @
f53fad46
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment