From 277ce814c865c364b6aeea7879a3c81afff977b7 Mon Sep 17 00:00:00 2001
From: nrb <freifunk@nicoboehr.de>
Date: Fri, 25 Jun 2021 17:08:29 +0200
Subject: [PATCH] bump to 2.4
---
.gitlab-ci.yml | 1 +
site.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df11745ea..756859003 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ stages:
default:
before_script:
+ - git submodule foreach 'git fetch --tags'
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
- eval $(ssh-agent -s)
- ssh-add <(echo "$GIT_SSH_PRIV_KEY")
diff --git a/site.mk b/site.mk
index c44537e62..2d675329b 100644
--- a/site.mk
+++ b/site.mk
@@ -85,7 +85,7 @@ DEFAULT_BUILD_DATE := $(shell date '+%Y-%m-%d')
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
--
GitLab