loading up the forgejo repo on tangled to test page performance
Merge pull request '[RELEASE] GITEA_VERSION is a fallback for FORGEJO_VERSION' (#2861) from earl-warren/forgejo:wip-version into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2861
+13
-3
+13
-3
Makefile
+13
-3
Makefile
···
88
88
ifneq ($(STORED_VERSION),)
89
89
FORGEJO_VERSION ?= $(STORED_VERSION)
90
90
else
91
-
# drop the "g" prefix prepended by git describe to the commit hash
92
-
FORGEJO_VERSION ?= $(shell git describe --exclude '*-test' --tags --always | sed 's/^v//' | sed 's/\-g/-/')+${GITEA_COMPATIBILITY}
91
+
ifneq ($(GITEA_VERSION),)
92
+
FORGEJO_VERSION ?= $(GITEA_VERSION)
93
+
FORGEJO_VERSION_API ?= $(GITEA_VERSION)+${GITEA_COMPATIBILITY}
94
+
else
95
+
# drop the "g" prefix prepended by git describe to the commit hash
96
+
FORGEJO_VERSION ?= $(shell git describe --exclude '*-test' --tags --always | sed 's/^v//' | sed 's/\-g/-/')+${GITEA_COMPATIBILITY}
97
+
endif
93
98
endif
94
99
FORGEJO_VERSION_MAJOR=$(shell echo $(FORGEJO_VERSION) | sed -e 's/\..*//')
95
100
FORGEJO_VERSION_MINOR=$(shell echo $(FORGEJO_VERSION) | sed -E -e 's/^([0-9]+\.[0-9]+).*/\1/')
···
106
111
RELEASE_VERSION ?= ${FORGEJO_VERSION}
107
112
VERSION ?= ${RELEASE_VERSION}
108
113
109
-
LDFLAGS := $(LDFLAGS) -X "main.ReleaseVersion=$(RELEASE_VERSION)" -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(FORGEJO_VERSION)" -X "main.Tags=$(TAGS)" -X "main.ForgejoVersion=$(FORGEJO_VERSION)"
114
+
FORGEJO_VERSION_API ?= ${FORGEJO_VERSION}
115
+
116
+
show-version-api:
117
+
@echo ${FORGEJO_VERSION_API}
118
+
119
+
LDFLAGS := $(LDFLAGS) -X "main.ReleaseVersion=$(RELEASE_VERSION)" -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(FORGEJO_VERSION)" -X "main.Tags=$(TAGS)" -X "main.ForgejoVersion=$(FORGEJO_VERSION_API)"
110
120
111
121
LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
112
122