bump core commitID

.drone.env

@@ -1,6 +1,6 @@
 # The test runner source for API tests
-CORE_COMMITID=403bd55c38a823f7915a04105e95fad5db84185b
-CORE_BRANCH=master
+CORE_COMMITID=a4a01ea97c126fa780318743ea1b47f3245acc1c
+CORE_BRANCH=version-status-php-fix2
 
 # The test runner source for UI tests
 WEB_COMMITID=b747d299b66a2f9f11559c8c14ce3d6fd64a6135

extensions/frontend/pkg/revaconfig/config.go

@@ -217,7 +217,7 @@ func FrontendConfigFromStruct(cfg *config.Config) map[string]interface{} {
 							"major":   version.Parsed().Major(),
 							"minor":   version.Parsed().Minor(),
 							"micro":   version.Parsed().Patch(),
-							"string":  version.String,
+							"string":  version.GetString(),
 						},
 					},
 				},

ocis-pkg/version/version.go

@@ -22,15 +22,7 @@ func Compiled() time.Time {
 }
 
 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()
 }
 
 func Parsed() *semver.Version {
@@ -47,12 +39,14 @@ func Parsed() *semver.Version {
 }
 
 func Long() string {
-	var s string
-	if Parsed().Metadata() == "" {
-		s = "-" + Parsed().Prerelease()
+	var p, m string
+	if Parsed().Prerelease() != "" {
+		p = "-" + Parsed().Prerelease()
+	}
+	if Parsed().Metadata() != "" {
+		m = "+" + Parsed().Metadata()
 	}
-	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" + p + m
 }