Skip to content
Snippets Groups Projects
Commit 277ce814 authored by Nico's avatar Nico
Browse files

bump to 2.4

parent 0ec0f664
Branches
Tags
No related merge requests found
Pipeline #958 failed
...@@ -12,6 +12,7 @@ stages: ...@@ -12,6 +12,7 @@ stages:
default: default:
before_script: before_script:
- git submodule foreach 'git fetch --tags'
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
- ssh-add <(echo "$GIT_SSH_PRIV_KEY") - ssh-add <(echo "$GIT_SSH_PRIV_KEY")
......
...@@ -85,7 +85,7 @@ DEFAULT_BUILD_DATE := $(shell date '+%Y-%m-%d') ...@@ -85,7 +85,7 @@ DEFAULT_BUILD_DATE := $(shell date '+%Y-%m-%d')
FFS_BUILD_DATE ?= $(DEFAULT_BUILD_DATE) FFS_BUILD_DATE ?= $(DEFAULT_BUILD_DATE)
DEFAULT_GLUON_RELEASE := 2.3+$(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) DEFAULT_GLUON_RELEASE := 2.4+$(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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment