diff options
| author | Peter Badida <KeyWeeUsr@users.noreply.github.com> | 2024-01-02 20:43:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-02 20:43:22 +0100 |
| commit | fc1c7a3c49abaf87a01fd20f0ae94d2ba3605f5a (patch) | |
| tree | 88fa09d6abbdad82167a98222f3c9e5fcc76686f | |
| parent | 2abfefc18cb3020b68a113d7099950e98709b22b (diff) | |
| download | syncthing-fc1c7a3c49abaf87a01fd20f0ae94d2ba3605f5a.tar.gz syncthing-fc1c7a3c49abaf87a01fd20f0ae94d2ba3605f5a.zip | |
lib/build: Allow semver build in version regex (fixes #9267) (#9316)
| -rw-r--r-- | lib/build/build.go | 2 | ||||
| -rw-r--r-- | lib/build/build_test.go | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/build/build.go b/lib/build/build.go index 549b49da6..4a02356ce 100644 --- a/lib/build/build.go +++ b/lib/build/build.go @@ -36,7 +36,7 @@ var ( LongVersion string Extra string - allowedVersionExp = regexp.MustCompile(`^v\d+\.\d+\.\d+(-[a-z0-9]+)*(\.\d+)*(\+\d+-g[0-9a-f]+)?(-[^\s]+)?$`) + allowedVersionExp = regexp.MustCompile(`^v\d+\.\d+\.\d+(-[a-z0-9]+)*(\.\d+)*(\+\d+-g[0-9a-f]+|\+[0-9a-z]+)?(-[^\s]+)?$`) envTags = []string{ "STGUIASSETS", diff --git a/lib/build/build_test.go b/lib/build/build_test.go index e2918c018..1bdc478ff 100644 --- a/lib/build/build_test.go +++ b/lib/build/build_test.go @@ -27,6 +27,11 @@ func TestAllowedVersions(t *testing.T) { {"v0.13.0-some-weird-but-allowed-tag", true}, {"v0.13.0-allowed.to.do.this", true}, {"v0.13.0+not.allowed.to.do.this", false}, + {"v1.27.0+xyz", true}, + {"v1.27.0-abc.1+xyz", true}, + {"v1.0.0+45", true}, + {"v1.0.0-noupgrade", true}, + {"v1.0.0+noupgrade", true}, } for i, c := range testcases { |