Skip to content

Commit 5b634ee

Browse files
committed
chore(cli): Re-enable flutter tests
And remove platform limitation in Dockerfile generator.
1 parent f74442e commit 5b634ee

File tree

5 files changed

+14
-18
lines changed

5 files changed

+14
-18
lines changed

apps/cli/fixtures/fixtures_test.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ void main() {
4747
_ => false,
4848
};
4949
final includeTests = Platform.environment['INCLUDE_TESTS']?.split(',');
50-
final excludeTests = {
51-
...?Platform.environment['EXCLUDE_TESTS']?.split(','),
52-
'flutter', // TODO(dnys1): Re-enable on stable release
53-
};
50+
final excludeTests = Platform.environment['EXCLUDE_TESTS']?.split(',');
5451
final includeApis = Platform.environment['INCLUDE_APIS']?.split(',');
5552
final clearCache = Platform.environment['CLEAR_CACHE'] == 'true';
5653

@@ -83,7 +80,8 @@ void main() {
8380
!includeTests.contains(p.basename(testDir.path))) {
8481
continue;
8582
}
86-
if (excludeTests.contains(p.basename(testDir.path))) {
83+
if (excludeTests != null &&
84+
excludeTests.contains(p.basename(testDir.path))) {
8785
continue;
8886
}
8987
final testRunner = TestRunner(

apps/cli/fixtures/standalone/flutter/goldens/ast.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/cli/fixtures/standalone/flutter/goldens/ast.resolved.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/cli/fixtures/standalone/flutter/goldens/celest.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/cli/lib/src/codegen/api/dockerfile_generator.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ ENV PORT=8080
3333
EXPOSE $PORT
3434
''');
3535

36-
// TODO(dnys1): Remove `--platform=linux/amd64` when Celest supports arm64.
3736
static const String _dartExeTemplate = r'''
3837
# syntax=docker/dockerfile:1.2
39-
FROM --platform=linux/amd64 celestdev/runtime:latest
38+
FROM celestdev/runtime:latest
4039
4140
WORKDIR /app
4241
COPY --chmod=755 main.exe .
@@ -46,17 +45,16 @@ ENV PORT=8080
4645
EXPOSE $PORT
4746
''';
4847

49-
// TODO(dnys1): Remove `--platform=linux/amd64` when Celest supports arm64.
5048
static final Template _flutterTemplate = Template(r'''
5149
# syntax=docker/dockerfile:1
52-
FROM --platform=linux/amd64 celestdev/flutter-builder:{{version}} AS build
50+
FROM celestdev/flutter-builder:{{version}} AS build
5351
5452
WORKDIR /app
5553
COPY main.aot.dill .
5654
5755
RUN [ "/usr/lib/dart/bin/utils/gen_snapshot", "--snapshot_kind=app-aot-elf", "--elf=/app/main.aot", "/app/main.aot.dill" ]
5856
59-
FROM --platform=linux/amd64 celestdev/flutter-runtime:{{version}}
57+
FROM celestdev/flutter-runtime:{{version}}
6058
6159
WORKDIR /app
6260
COPY --from=build /app/main.aot main.aot

0 commit comments

Comments
 (0)