8000 Feature/new devel versioning scheme by hkernbach · Pull Request #6312 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Feature/new devel versioning scheme #6312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 11, 2018
Merged

Feature/new devel versioning scheme #6312

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e5e308
switch to 3.4.0-devel
fceller Aug 30, 2018
6260b9e
removed old version formatter, ui now showing full version - not a su…
hkernbach Aug 31, 2018
7d28bcf
added verisoning tests for semnativ versioning
hkernbach Aug 31, 2018
e4b5354
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
fceller Aug 31, 2018
646db34
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
jsteemann Aug 31, 2018
1bab0fa
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
jsteemann Sep 10, 2018
b92ca2e
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
jsteemann Sep 10, 2018
90fb417
jslint
jsteemann Sep 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed old version formatter, ui now showing full version - not a su… 
…bstring anymore
  • Loading branch information
@hkernbach
hkernbach committed Aug 31, 2018
commit 6260b9e46c0247794cf78cb41edb0c957e55762b
2 changes: 1 addition & 1 deletion js/apps/system/_admin/aardvark/APP/frontend/js/routers/versionCheck.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
window.versionHelper.fromString(data.version);

$('.navbar #currentVersion').html(
data.version.substr(0, 7) + '<i class="fa fa-check-circle"></i>'
data.version + '<i class="fa fa-check-circle"></i>'
);

window.parseVersions = function (json) {
Expand Down
13 changes: 1 addition & 12 deletions js/server/modules/@arangodb/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,7 @@ exports.db = internal.db;
exports.plainServerVersion = function () {
let version = internal.version;

if (semver.valid(version) === null) {
let devel = version.match(/(.*)\.devel/);
if (devel !== null) {
version = devel[1] + '.0';
} else {
devel = version.match(/(.*)((milestone|alpha|beta|devel|rc)[0-9]*)$/);

if (devel !== null) {
version = devel[1] + '0';
}
}
} else {
if (semver.valid(version)) {
version = semver.major(version) + '.' + semver.minor(version) + '.' + semver.patch(version);
}

Expand Down
0