Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon site
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon site
Commits
f53fad46
Commit
f53fad46
authored
5 years ago
by
Nico
Browse files
Options
Downloads
Patches
Plain Diff
fix failing build because of BUILD_DATE var name collision
parent
b27bcb21
No related branches found
No related tags found
No related merge requests found
Pipeline
#332
passed
5 years ago
Stage: generate_date
Stage: build
Stage: package
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
site.mk
+2
-2
2 additions, 2 deletions
site.mk
with
4 additions
and
4 deletions
.gitlab-ci.yml
+
2
−
2
View file @
f53fad46
...
@@ -21,8 +21,8 @@ generate_date:
...
@@ -21,8 +21,8 @@ generate_date:
.target
:
.target
:
stage
:
build
stage
:
build
script
:
script
:
-
make -C gluon update GLUON_SITEDIR="$CI_PROJECT_DIR" BUILD_DATE=$(cat build.date)
-
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 BUILD_DATE=$(cat build.date) V=1 -j`nproc`
-
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
:
except
:
-
tags
-
tags
artifacts
:
artifacts
:
...
...
This diff is collapsed.
Click to expand it.
site.mk
+
2
−
2
View file @
f53fad46
...
@@ -81,9 +81,9 @@ endif
...
@@ -81,9 +81,9 @@ endif
DEFAULT_BUILD_DATE
:=
$(
shell
date
'+%Y-%m-%d'
)
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
GLUON_LANGS
:=
de en
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment