bump core commitID

owncloud · May 7, 2022 · 010944d · 010944d
1 parent 5f0c635
commit 010944d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 22 deletions.
diff --git a/.drone.env b/.drone.env
@@ -1,6 +1,6 @@
 # The test runner source for API tests
-CORE_COMMITID=403bd55c38a823f7915a04105e95fad5db84185b
-CORE_BRANCH=master
+CORE_COMMITID=b19721114df5cefeca22926a97e635245849ddf6
+CORE_BRANCH=version-status-php-fix2
 
 # The test runner source for UI tests
 WEB_COMMITID=b747d299b66a2f9f11559c8c14ce3d6fd64a6135

diff --git a/extensions/frontend/pkg/revaconfig/config.go b/extensions/frontend/pkg/revaconfig/config.go
@@ -143,7 +143,7 @@ func FrontendConfigFromStruct(cfg *config.Config) map[string]interface{} {
 									"versionstring":  version.GetString(),
 									"edition":        "Community",
 									"productname":    "Infinite Scale",
-									"product":        "oCIS",
+									"product":        "Infinite Scale",
 									"hostname":       "",
 								},
 								"support_url_signing": true,
@@ -212,12 +212,12 @@ func FrontendConfigFromStruct(cfg *config.Config) map[string]interface{} {
 							},
 						},
 						"version": map[string]interface{}{
-							"product": "oCIS",
+							"product": "Infinite Scale",
 							"edition": "Community",
 							"major":   version.Parsed().Major(),
 							"minor":   version.Parsed().Minor(),
 							"micro":   version.Parsed().Patch(),
-							"string":  version.String,
+							"string":  version.GetString(),
 						},
 					},
 				},

diff --git a/extensions/ocdav/pkg/config/defaults/defaultconfig.go b/extensions/ocdav/pkg/config/defaults/defaultconfig.go
@@ -46,7 +46,7 @@ func DefaultConfig() *config.Config {
 		Status: config.Status{
 			Version:       version.Long(),
 			VersionString: version.GetString(),
-			Product:       "oCIS",
+			Product:       "Infinite Scale",
 			ProductName:   "Infinite Scale",
 			Edition:       "Community",
 		},

diff --git a/ocis-pkg/version/version.go b/ocis-pkg/version/version.go
@@ -21,18 +21,12 @@ func Compiled() time.Time {
 	return t
 }
 
+// GetString returns a version string with pre-releases and metadata
 func GetString() string {
-	if String == "dev" {
-		return "0.0.0+dev"
-	}
-	parsedVersion, err := semver.NewVersion(String)
-	// We have no semver version but a commitid
-	if err != nil {
-		return String
-	}
-	return parsedVersion.String()
+	return Parsed().String()
 }
 
+// Parsed returns a semver Version
 func Parsed() *semver.Version {
 	var versionToParse string
 	if String == "dev" {
@@ -41,18 +35,18 @@ func Parsed() *semver.Version {
 	parsedVersion, err := semver.NewVersion(versionToParse)
 	// We have no semver version but a commitid
 	if err != nil {
-		parsedVersion, _ = semver.NewVersion("0.0.0+" + String)
+		parsedVersion, err = semver.NewVersion("0.0.0+" + String)
+		// this should never happen
+		if err != nil {
+			return &semver.Version{}
+		}
 	}
 	return parsedVersion
 }
 
+// Long returns the legacy version with 4 number parts like 10.9.8.0
 func Long() string {
-	var s string
-	if Parsed().Metadata() == "" {
-		s = "-" + Parsed().Prerelease()
-	}
-	s = "+" + Parsed().Metadata()
 	return strconv.FormatInt(Parsed().Major(), 10) + "." +
 		strconv.FormatInt(Parsed().Minor(), 10) + "." +
-		strconv.FormatInt(Parsed().Patch(), 10) + "." + "0" + s
+		strconv.FormatInt(Parsed().Patch(), 10) + "." + "0"
 }