Skip to content

Commit a6dc157

Browse files
iinozemtsevCommit Queue
iinozemtsev
authored and
Commit Queue
committed
Fix scripts for riscv64
This is a follow-up fix for #241. Change-Id: Ie2725683024615282a0bf91c70a26056b8058d59 Reviewed-on: https://dart-review.googlesource.com/c/dart-docker/+/445080 Reviewed-by: Alexander Aprelev <[email protected]> Commit-Queue: Ivan Inozemtsev <[email protected]>
1 parent 2d53110 commit a6dc157

File tree

7 files changed

+47
-6
lines changed

7 files changed

+47
-6
lines changed

‎scripts/lib/src/dockerfile.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ String buildDockerfile(DartSdkVersion version, String template) {
1212
'DART_SHA256_X64': version.sha256['x64'],
1313
'DART_SHA256_ARM': version.sha256['arm'],
1414
'DART_SHA256_ARM64': version.sha256['arm64'],
15+
'DART_SHA256_RISCV64': version.sha256['riscv64'],
1516
};
1617
var dockerfile = template.splitMapJoin(
1718
RegExp(r'{{(.*?)}}'),

‎scripts/lib/src/versions.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class DartSdkVersion {
111111

112112
Future<Map<String, String>> _readSha256(Version version) async {
113113
var sha256 = <String, String>{};
114-
for (var arch in ['x64', 'arm', 'arm64']) {
114+
for (var arch in ['x64', 'arm', 'arm64', 'riscv64']) {
115115
var sdk = 'dartsdk-linux-$arch-release.zip';
116116
var sha256Url = baseUri.resolve(
117117
'$channel/release/$version/sdk/$sdk.sha256sum',

‎scripts/test/dockerfile_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var version = DartSdkVersion('stable', Version.parse('3.14.1'), {
1313
'x64': 'abc',
1414
'arm': 'def',
1515
'arm64': 'ghi',
16+
'riscv64': 'jkl',
1617
}, fakeRead);
1718

1819
void main() {
@@ -23,6 +24,7 @@ ENV DART_VERSION 3.14.1
2324
ENV DART_SHA256_X64 abc
2425
ENV DART_SHA256_ARM def
2526
ENV DART_SHA256_ARM64 ghi
27+
ENV DART_SHA256_RISCV64 jkl
2628
''';
2729
var dockerfile = buildDockerfile(version, dockerfileTemplate);
2830
expect(dockerfile, expected);

‎scripts/test/update_test.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ void main() {
3636
'arm-sha *dartsdk-linux-arm-release.zip',
3737
'/dart-archive/channels/beta/release/2.14.0-16.1.beta/sdk/dartsdk-linux-arm64-release.zip.sha256sum':
3838
'arm64-sha *dartsdk-linux-arm64-release.zip',
39+
'/dart-archive/channels/beta/release/2.14.0-16.1.beta/sdk/dartsdk-linux-riscv64-release.zip.sha256sum':
40+
'riscv64-sha *dartsdk-linux-riscv64-release.zip',
3941
});
4042
var fileSystem = TestFileSystem.build({
4143
'versions.json': versions,
@@ -65,6 +67,7 @@ ENV DART_VERSION 2.14.0-16.1.beta
6567
ENV DART_SHA256_X64 x64-sha
6668
ENV DART_SHA256_ARM arm-sha
6769
ENV DART_SHA256_ARM64 arm64-sha
70+
ENV DART_SHA256_RISCV64 riscv64-sha
6871
''';
6972
expect(
7073
fileSystem.fileSystem.file('beta/trixie/Dockerfile').readAsStringSync(),
@@ -121,6 +124,7 @@ ENV DART_VERSION 2.13.0-211.14.beta
121124
ENV DART_SHA256_X64 jmn
122125
ENV DART_SHA256_ARM opq
123126
ENV DART_SHA256_ARM64 rst
127+
ENV DART_SHA256_RISCV64 uvw
124128
''';
125129
expect(
126130
fileSystem.fileSystem.file('beta/trixie/Dockerfile').readAsStringSync(),
@@ -133,6 +137,7 @@ ENV DART_VERSION 2.12.4
133137
ENV DART_SHA256_X64 abc
134138
ENV DART_SHA256_ARM def
135139
ENV DART_SHA256_ARM64 ghi
140+
ENV DART_SHA256_RISCV64 jkl
136141
''';
137142
expect(
138143
fileSystem.fileSystem.file('stable/trixie/Dockerfile').readAsStringSync(),

‎scripts/test/utils.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import 'package:scripts/src/http.dart';
99
const versions = '''{
1010
"stable": {
1111
"version": "2.12.4",
12-
"sha256": {"x64": "abc", "arm": "def", "arm64": "ghi"}
12+
"sha256": {"x64": "abc", "arm": "def", "arm64": "ghi", "riscv64": "jkl"}
1313
},
1414
"beta": {
1515
"version": "2.13.0-211.14.beta",
16-
"sha256": {"x64": "jmn", "arm": "opq", "arm64": "rst"}
16+
"sha256": {"x64": "jmn", "arm": "opq", "arm64": "rst", "riscv64": "uvw"}
1717
}
1818
}''';
1919
const dockerfileTemplate = '''
@@ -22,6 +22,7 @@ ENV DART_VERSION {{DART_VERSION}}
2222
ENV DART_SHA256_X64 {{DART_SHA256_X64}}
2323
ENV DART_SHA256_ARM {{DART_SHA256_ARM}}
2424
ENV DART_SHA256_ARM64 {{DART_SHA256_ARM64}}
25+
ENV DART_SHA256_RISCV64 {{DART_SHA256_RISCV64}}
2526
''';
2627

2728
final fakeRead = (_, {headers}) => throw 'unimplemented';

‎scripts/test/verify_test.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@ void main() {
2323
'def *dartsdk-linux-arm-release.zip',
2424
'/dart-archive/channels/stable/release/2.12.4/sdk/dartsdk-linux-arm64-release.zip.sha256sum':
2525
'ghi *dartsdk-linux-arm64-release.zip',
26+
'/dart-archive/channels/stable/release/2.12.4/sdk/dartsdk-linux-riscv64-release.zip.sha256sum':
27+
'jkl *dartsdk-linux-riscv64-release.zip',
2628
'/dart-archive/channels/beta/release/2.13.0-211.14.beta/sdk/dartsdk-linux-x64-release.zip.sha256sum':
2729
'jmn *dartsdk-linux-x64-release.zip',
2830
'/dart-archive/channels/beta/release/2.13.0-211.14.beta/sdk/dartsdk-linux-arm-release.zip.sha256sum':
2931
'opq *dartsdk-linux-arm-release.zip',
3032
'/dart-archive/channels/beta/release/2.13.0-211.14.beta/sdk/dartsdk-linux-arm64-release.zip.sha256sum':
3133
'rst *dartsdk-linux-arm64-release.zip',
34+
'/dart-archive/channels/beta/release/2.13.0-211.14.beta/sdk/dartsdk-linux-riscv64-release.zip.sha256sum':
35+
'uvw *dartsdk-linux-riscv64-release.zip',
3236
});
3337

3438
await verify.verify(fileSystem, read);
@@ -42,6 +46,8 @@ void main() {
4246
'def *dartsdk-linux-arm-release.zip',
4347
'/dart-archive/channels/stable/release/2.12.4/sdk/dartsdk-linux-arm64-release.zip.sha256sum':
4448
'ghi *dartsdk-linux-arm64-release.zip',
49+
'/dart-archive/channels/stable/release/2.12.4/sdk/dartsdk-linux-riscv64-release.zip.sha256sum':
50+
'uvw *dartsdk-linux-riscv64-release.zip',
4551
'/dart-archive/channels/beta/release/2.13.0-211.14.beta/sdk/dartsdk-linux-x64-release.zip.sha256sum':
4652
'jmn *dartsdk-linux-x64-release.zip',
4753
'/dart-archive/channels/beta/release/2.13.0-211.14.beta/sdk/dartsdk-linux-arm-release.zip.sha256sum':

‎scripts/test/versions_test.dart

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,35 @@ final stable = DartSdkVersion('stable', Version.parse('2.12.4'), {
1212
'x64': 'abc',
1313
'arm': 'def',
1414
'arm64': 'ghi',
15+
'riscv64': 'jkl',
1516
}, fakeRead);
1617
final beta = DartSdkVersion('beta', Version.parse('2.13.0-211.6.beta'), {
1718
'x64': 'jmn',
1819
'arm': 'opq',
1920
'arm64': 'rst',
21+
'riscv64': 'uvw',
2022
}, fakeRead);
2123

2224
void main() {
2325
test('fromJson', () {
2426
var versions = versionsFromJson(<String, dynamic>{
2527
'stable': {
2628
'version': '2.12.4',
27-
'sha256': {'x64': 'abc', 'arm': 'def', 'arm64': 'ghi'},
29+
'sha256': {
30+
'x64': 'abc',
31+
'arm': 'def',
32+
'arm64': 'ghi',
33+
'riscv64': 'jkl',
34+
},
2835
},
2936
'beta': {
3037
'version': '2.13.0-211.6.beta',
31-
'sha256': {'x64': 'jmn', 'arm': 'opq', 'arm64': 'rst'},
38+
'sha256': {
39+
'x64': 'jmn',
40+
'arm': 'opq',
41+
'arm64': 'rst',
42+
'riscv64': 'uvw',
43+
},
3244
},
3345
}, fakeRead);
3446

@@ -56,11 +68,13 @@ void main() {
5668
'x64': 'abc',
5769
'arm': 'def',
5870
'arm64': 'ghi',
71+
'riscv64': 'jkl',
5972
});
6073
expect(versions['beta']?.sha256, {
6174
'x64': 'jmn',
6275
'arm': 'opq',
6376
'arm64': 'rst',
77+
'riscv64': 'uvw',
6478
});
6579
});
6680

@@ -83,6 +97,8 @@ void main() {
8397
'def *dartsdk-linux-arm-release.zip',
8498
'/dart-archive/channels/stable/release/3.13.2/sdk/dartsdk-linux-arm64-release.zip.sha256sum':
8599
'ghi *dartsdk-linux-arm64-release.zip',
100+
'/dart-archive/channels/stable/release/3.13.2/sdk/dartsdk-linux-riscv64-release.zip.sha256sum':
101+
'jkl *dartsdk-linux-riscv64-release.zip',
86102
});
87103
var version = DartSdkVersion('stable', Version.parse('2.12.4'), {}, read);
88104
expect(await version.update(), true);
@@ -92,6 +108,7 @@ void main() {
92108
'x64': 'abc',
93109
'arm': 'def',
94110
'arm64': 'ghi',
111+
'riscv64': 'jkl',
95112
}, fakeRead),
96113
);
97114
});
@@ -104,8 +121,15 @@ void main() {
104121
'arm-sha *dartsdk-linux-arm-release.zip',
105122
'/dart-archive/channels/stable/release/2.12.4/sdk/dartsdk-linux-arm64-release.zip.sha256sum':
106123
'arm64-sha *dartsdk-linux-arm64-release.zip',
124+
'/dart-archive/channels/stable/release/2.12.4/sdk/dartsdk-linux-riscv64-release.zip.sha256sum':
125+
'riscv64-sha *dartsdk-linux-riscv64-release.zip',
107126
});
108-
var sha256 = {'x64': 'x64-sha', 'arm': 'arm-sha', 'arm64': 'arm64-sha'};
127+
var sha256 = {
128+
'x64': 'x64-sha',
129+
'arm': 'arm-sha',
130+
'arm64': 'arm64-sha',
131+
'riscv64': 'riscv64-sha',
132+
};
109133
var version = DartSdkVersion(
110134
'stable',
111135
Version.parse('2.12.4'),
@@ -123,6 +147,8 @@ void main() {
123147
'arm-sha *dartsdk-linux-arm-release.zip',
124148
'/dart-archive/channels/stable/release/2.12.4/sdk/dartsdk-linux-arm64-release.zip.sha256sum':
125149
'arm64-sha *dartsdk-linux-arm64-release.zip',
150+
'/dart-archive/channels/stable/release/2.12.4/sdk/dartsdk-linux-riscv64-release.zip.sha256sum':
151+
'riscv64-sha *dartsdk-linux-riscv64-release.zip',
126152
});
127153
var sha256 = {'x64': 'wrong-sha', 'arm': 'wrong-sha', 'arm64': 'wrong-sha'};
128154
var version = DartSdkVersion(

0 commit comments

Comments
 (0)