Skip to content

Commit d6c053a

Browse files
committed
update
1 parent 69ee26d commit d6c053a

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

test/translate.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ tape('Version string to Semver translator', function (t) {
1818
st.end();
1919
});
2020
t.test('Broken nightly with leading zeroes', function (st) {
21+
st.equal(versionToSemver('0.3.6-nightly.2016.08.27+commit.91d4fa47.Emscripten.clang'), '0.3.6-nightly.2016.8.27+commit.91d4fa47.Emscripten.clang');
2122
st.equal(versionToSemver('0.4.1-nightly.2016.09.09+commit.79867f49.Emscripten.clang'), '0.4.1-nightly.2016.9.9+commit.79867f49.Emscripten.clang');
2223
st.end();
2324
});
@@ -40,6 +41,10 @@ tape('Version string to Semver translator', function (t) {
4041
);
4142
st.end();
4243
});
44+
t.test('Broken 0.3.4 nightly', function (st) {
45+
st.equal(versionToSemver('0.3.4-0/Release-Emscripten/clang/Interpreter'), '0.3.4');
46+
st.end();
47+
});
4348
t.test('Old style 0.3.5', function (st) {
4449
// The one in the solc-bin list
4550
st.equal(versionToSemver('0.3.5-371690f0/Release-Emscripten/clang/Interpreter'), '0.3.5+commit.371690f0');

translate.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const linker = require('./linker.js');
55
/// 0.3.6-3fc68da5/Release-Emscripten/clang
66
/// 0.3.5-371690f0/Release-Emscripten/clang/Interpreter
77
/// 0.3.5-0/Release-Emscripten/clang/Interpreter
8+
/// 0.3.4-0/Release-Emscripten/clang/Interpreter
89
/// 0.2.0-e7098958/.-Emscripten/clang/int linked to libethereum-1.1.1-bbb80ab0/.-Emscripten/clang/int
910
/// 0.1.3-0/.-/clang/int linked to libethereum-0.9.92-0/.-/clang/int
1011
/// 0.1.2-5c3bfd4b*/.-/clang/int
@@ -21,11 +22,14 @@ function versionToSemver (version) {
2122
if (version.indexOf('0.1.3-0') !== -1) {
2223
return '0.1.3';
2324
}
25+
if (version.indexOf('0.3.4-0') !== -1) {
26+
return '0.3.4';
27+
}
2428
if (version.indexOf('0.3.5-0') !== -1) {
2529
return '0.3.5';
2630
}
2731
// This parses the obsolete nightly style where the date can have leading zeroes.
28-
var nightlyParsed = version.match(/^([0-9]+\.[0-9]+\.[0-9]+)-nightly\.([0-9]+)\.0([1-9])\.0([1-9])(.*)$/);
32+
var nightlyParsed = version.match(/^([0-9]+\.[0-9]+\.[0-9]+)-nightly\.([0-9]+)\.0?([1-9])\.0?([1-9])(.*)$/);
2933
if (nightlyParsed) {
3034
return nightlyParsed[1] + '-nightly.' + nightlyParsed[2] + '.' + nightlyParsed[3] + '.' + nightlyParsed[4] + nightlyParsed[5];
3135
}

0 commit comments

Comments
 (0)