From 6ede08ce77cb01690a6996ff1497d8282149b661 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 25 Aug 2017 12:08:46 +0200 Subject: [PATCH 1/3] Update hard-coded version to 1.3.0+dev --- integrations/version_test.go | 2 +- main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integrations/version_test.go b/integrations/version_test.go index 95b4dbc952a2d..3e7406bab47f7 100644 --- a/integrations/version_test.go +++ b/integrations/version_test.go @@ -17,7 +17,7 @@ import ( func TestVersion(t *testing.T) { prepareTestEnv(t) - setting.AppVer = "1.1.0+dev" + setting.AppVer = "1.3.0+dev" req := NewRequest(t, "GET", "/api/v1/version") resp := MakeRequest(t, req, http.StatusOK) diff --git a/main.go b/main.go index c2acda99afc47..e503e27428eb9 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ import ( ) // Version holds the current Gitea version -var Version = "1.1.0+dev" +var Version = "1.3.0+dev" // Tags holds the build tags used var Tags = "" From fdbe9c151a6e80ecd8a0360792bc3bdb9d28631d Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 25 Aug 2017 13:08:27 +0200 Subject: [PATCH 2/3] Use -dev (1.3.0-dev is less than 1.3.0, according to semver) --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index e503e27428eb9..e55779bea58f3 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ import ( ) // Version holds the current Gitea version -var Version = "1.3.0+dev" +var Version = "1.3.0-dev" // Tags holds the build tags used var Tags = "" From 8e16bf6ed19147f070bcf2a6c11c3227af2969a9 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 25 Aug 2017 14:46:09 +0200 Subject: [PATCH 3/3] Use fake version for testing purpose --- integrations/version_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/version_test.go b/integrations/version_test.go index 3e7406bab47f7..9a30bfb53b935 100644 --- a/integrations/version_test.go +++ b/integrations/version_test.go @@ -17,7 +17,7 @@ import ( func TestVersion(t *testing.T) { prepareTestEnv(t) - setting.AppVer = "1.3.0+dev" + setting.AppVer = "test-version-1" req := NewRequest(t, "GET", "/api/v1/version") resp := MakeRequest(t, req, http.StatusOK)