diff --git a/Makefile b/Makefile index 34bc60e0c..ddebcc9e4 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ VERSION = ${GITEA_VERSION} # SemVer FORGEJO_VERSION := 5.0.0+0-gitea-1.20.0 -LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" -X "code.gitea.io/gitea/routers/api/forgejo/v1.ForgejoVersion=$(FORGEJO_VERSION)" -X "main.ForgejoVersion=$(FORGEJO_VERSION)" +LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" -X "main.ForgejoVersion=$(FORGEJO_VERSION)" LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64 diff --git a/routers/api/forgejo/v1/forgejo.go b/routers/api/forgejo/v1/forgejo.go index 54ab19d7b..0f1f4f193 100644 --- a/routers/api/forgejo/v1/forgejo.go +++ b/routers/api/forgejo/v1/forgejo.go @@ -6,6 +6,7 @@ import ( "net/http" "code.gitea.io/gitea/modules/json" + "code.gitea.io/gitea/modules/setting" ) type Forgejo struct{} @@ -16,9 +17,7 @@ func NewForgejo() *Forgejo { return &Forgejo{} } -var ForgejoVersion = "development" - func (f *Forgejo) GetVersion(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) - _ = json.NewEncoder(w).Encode(Version{&ForgejoVersion}) + _ = json.NewEncoder(w).Encode(Version{&setting.ForgejoVersion}) } diff --git a/tests/integration/api_forgejo_version_test.go b/tests/integration/api_forgejo_version_test.go index b8b8de8ee..b59afcbb1 100644 --- a/tests/integration/api_forgejo_version_test.go +++ b/tests/integration/api_forgejo_version_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/routers/api/forgejo/v1" + v1 "code.gitea.io/gitea/routers/api/forgejo/v1" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -21,5 +21,5 @@ func TestAPIForgejoVersion(t *testing.T) { var version v1.Version DecodeJSON(t, resp, &version) - assert.Equal(t, "development", *version.Version) + assert.Equal(t, "1.0.0", *version.Version) }