foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 12:54:53 -05:00
Code Issues Wiki Activity

[CLEANUP] Reuse ForgejoVersion variable

Browse source 
- Resolves https://codeberg.org/forgejo/forgejo/issues/1226

(cherry picked from commit e383b70109)
(cherry picked from commit 029cfa34de)
(cherry picked from commit 81392b8c55)
(cherry picked from commit 0ebecca1e6)
This commit is contained in:
Gusted 2023-11-11 12:15:26 +01:00 committed by Earl Warren
parent 26abf78374
commit aff135418d
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -97,7 +97,7 @@ VERSION = ${GITEA_VERSION}
# SemVer # SemVer
FORGEJO_VERSION := 6.0.0+0-gitea-1.21.0 FORGEJO_VERSION := 6.0.0+0-gitea-1.21.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 LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64

5
routers/api/forgejo/v1/forgejo.go
View file

@ -6,6 +6,7 @@ import (
"net/http" "net/http"
"code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/setting"
) )
type Forgejo struct{} type Forgejo struct{}
@ -16,9 +17,7 @@ func NewForgejo() *Forgejo {
return &Forgejo{} return &Forgejo{}
} }
var ForgejoVersion = "development"
func (f *Forgejo) GetVersion(w http.ResponseWriter, r *http.Request) { func (f *Forgejo) GetVersion(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
_ = json.NewEncoder(w).Encode(Version{&ForgejoVersion}) _ = json.NewEncoder(w).Encode(Version{&setting.ForgejoVersion})
} }

4
tests/integration/api_forgejo_version_test.go
View file

@ -7,7 +7,7 @@ import (
"net/http" "net/http"
"testing" "testing"
"code.gitea.io/gitea/routers/api/forgejo/v1" v1 "code.gitea.io/gitea/routers/api/forgejo/v1"
"code.gitea.io/gitea/tests" "code.gitea.io/gitea/tests"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -21,5 +21,5 @@ func TestAPIForgejoVersion(t *testing.T) {
var version v1.Version var version v1.Version
DecodeJSON(t, resp, &version) DecodeJSON(t, resp, &version)
assert.Equal(t, "development", *version.Version) assert.Equal(t, "1.0.0", *version.Version)
} }