Skip to content

Commit 6f960f2

Browse files
Gustedearl-warren
authored andcommitted
[CLEANUP] Reuse ForgejoVersion variable
- Resolves https://codeberg.org/forgejo/forgejo/issues/1226 (cherry picked from commit e383b70109325833034dd0593727e5eec3acf92d) (cherry picked from commit 029cfa34de06e7706c3f85134468f2faadf30a21) (cherry picked from commit 81392b8c55b2f5893a3222c521f697d1d53adbb2) (cherry picked from commit 0ebecca1e6edd31ec95c5d8be3d02814fb39179f) (cherry picked from commit aff135418d96b1f7418e55882ee0bbdbf2b04c5e) (cherry picked from commit b5982f5008a0a60d0cf874edbe281c3f73b69e97) (cherry picked from commit 00f86df) (cherry picked from commit 178908c047b9a13a7b61e90490d525ddbeae45e8) (cherry picked from commit 9cc57d1b3f48a9f530fb761bd70d224d069ea1eb) (cherry picked from commit dc80ba9a97d3e8f78a9ecd3875105375611ebc45) (cherry picked from commit 5b2f1d7149b3098b6b82ae8d588068ba476eb534) (cherry picked from commit f0ab85cd06a37eb81343c830180b6283e924015c)
1 parent 089f51a commit 6f960f2

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ VERSION = ${GITEA_VERSION}
9797
# SemVer
9898
FORGEJO_VERSION := 5.0.0+0-gitea-1.20.0
9999

100-
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)"
100+
LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" -X "main.ForgejoVersion=$(FORGEJO_VERSION)"
101101

102102
LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
103103

routers/api/forgejo/v1/forgejo.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"net/http"
77

88
"code.gitea.io/gitea/modules/json"
9+
"code.gitea.io/gitea/modules/setting"
910
)
1011

1112
type Forgejo struct{}
@@ -16,9 +17,7 @@ func NewForgejo() *Forgejo {
1617
return &Forgejo{}
1718
}
1819

19-
var ForgejoVersion = "development"
20-
2120
func (f *Forgejo) GetVersion(w http.ResponseWriter, r *http.Request) {
2221
w.WriteHeader(http.StatusOK)
23-
_ = json.NewEncoder(w).Encode(Version{&ForgejoVersion})
22+
_ = json.NewEncoder(w).Encode(Version{&setting.ForgejoVersion})
2423
}

tests/integration/api_forgejo_version_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/http"
88
"testing"
99

10-
"code.gitea.io/gitea/routers/api/forgejo/v1"
10+
v1 "code.gitea.io/gitea/routers/api/forgejo/v1"
1111
"code.gitea.io/gitea/tests"
1212

1313
"github.com/stretchr/testify/assert"
@@ -21,5 +21,5 @@ func TestAPIForgejoVersion(t *testing.T) {
2121

2222
var version v1.Version
2323
DecodeJSON(t, resp, &version)
24-
assert.Equal(t, "development", *version.Version)
24+
assert.Equal(t, "1.0.0", *version.Version)
2525
}

0 commit comments

Comments
 (0)