File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ tape('Version string to Semver translator', function (t) {
18
18
st . end ( ) ;
19
19
} ) ;
20
20
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' ) ;
21
22
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' ) ;
22
23
st . end ( ) ;
23
24
} ) ;
@@ -40,6 +41,10 @@ tape('Version string to Semver translator', function (t) {
40
41
) ;
41
42
st . end ( ) ;
42
43
} ) ;
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
+ } ) ;
43
48
t . test ( 'Old style 0.3.5' , function ( st ) {
44
49
// The one in the solc-bin list
45
50
st . equal ( versionToSemver ( '0.3.5-371690f0/Release-Emscripten/clang/Interpreter' ) , '0.3.5+commit.371690f0' ) ;
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ const linker = require('./linker.js');
5
5
/// 0.3.6-3fc68da5/Release-Emscripten/clang
6
6
/// 0.3.5-371690f0/Release-Emscripten/clang/Interpreter
7
7
/// 0.3.5-0/Release-Emscripten/clang/Interpreter
8
+ /// 0.3.4-0/Release-Emscripten/clang/Interpreter
8
9
/// 0.2.0-e7098958/.-Emscripten/clang/int linked to libethereum-1.1.1-bbb80ab0/.-Emscripten/clang/int
9
10
/// 0.1.3-0/.-/clang/int linked to libethereum-0.9.92-0/.-/clang/int
10
11
/// 0.1.2-5c3bfd4b*/.-/clang/int
@@ -21,11 +22,14 @@ function versionToSemver (version) {
21
22
if ( version . indexOf ( '0.1.3-0' ) !== - 1 ) {
22
23
return '0.1.3' ;
23
24
}
25
+ if ( version . indexOf ( '0.3.4-0' ) !== - 1 ) {
26
+ return '0.3.4' ;
27
+ }
24
28
if ( version . indexOf ( '0.3.5-0' ) !== - 1 ) {
25
29
return '0.3.5' ;
26
30
}
27
31
// This parses the obsolete nightly style where the date can have leading zeroes.
28
- var nightlyParsed = version . match ( / ^ ( [ 0 - 9 ] + \. [ 0 - 9 ] + \. [ 0 - 9 ] + ) - n i g h t l y \. ( [ 0 - 9 ] + ) \. 0 ( [ 1 - 9 ] ) \. 0 ( [ 1 - 9 ] ) ( .* ) $ / ) ;
32
+ var nightlyParsed = version . match ( / ^ ( [ 0 - 9 ] + \. [ 0 - 9 ] + \. [ 0 - 9 ] + ) - n i g h t l y \. ( [ 0 - 9 ] + ) \. 0 ? ( [ 1 - 9 ] ) \. 0 ? ( [ 1 - 9 ] ) ( .* ) $ / ) ;
29
33
if ( nightlyParsed ) {
30
34
return nightlyParsed [ 1 ] + '-nightly.' + nightlyParsed [ 2 ] + '.' + nightlyParsed [ 3 ] + '.' + nightlyParsed [ 4 ] + nightlyParsed [ 5 ] ;
31
35
}
You can’t perform that action at this time.
0 commit comments