Skip to content

Commit ba5f9f7

Browse files
author
Earl Warren
committed
Merge pull request '[RELEASE] Gitea version is for interoperability only' (go-gitea#2327) from earl-warren/forgejo:wip-version into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2327 Reviewed-by: Otto <[email protected]>
2 parents 29007c0 + db3b867 commit ba5f9f7

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,13 @@ HUGO_VERSION ?= 0.111.3
8888

8989
STORED_VERSION=$(shell cat $(STORED_VERSION_FILE) 2>/dev/null)
9090
ifneq ($(STORED_VERSION),)
91-
GITEA_VERSION ?= $(STORED_VERSION)
91+
FORGEJO_VERSION ?= $(STORED_VERSION)
9292
else
93-
GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
93+
FORGEJO_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
9494
endif
95-
VERSION = ${GITEA_VERSION}
95+
VERSION ?= ${FORGEJO_VERSION}
9696

97-
# SemVer
98-
FORGEJO_VERSION := 7.0.0+0-gitea-1.22.0
97+
GITEA_VERSION ?= 1.22.0
9998

10099
LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" -X "main.ForgejoVersion=$(FORGEJO_VERSION)"
101100

0 commit comments

Comments
 (0)