Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions apps/cli/fixtures/fixtures_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ void main() {
_ => false,
};
final includeTests = Platform.environment['INCLUDE_TESTS']?.split(',');
final excludeTests = {
...?Platform.environment['EXCLUDE_TESTS']?.split(','),
'flutter', // TODO(dnys1): Re-enable on stable release
};
final excludeTests = Platform.environment['EXCLUDE_TESTS']?.split(',');
final includeApis = Platform.environment['INCLUDE_APIS']?.split(',');
final clearCache = Platform.environment['CLEAR_CACHE'] == 'true';

Expand Down Expand Up @@ -83,7 +80,8 @@ void main() {
!includeTests.contains(p.basename(testDir.path))) {
continue;
}
if (excludeTests.contains(p.basename(testDir.path))) {
if (excludeTests != null &&
excludeTests.contains(p.basename(testDir.path))) {
continue;
}
final testRunner = TestRunner(
Expand Down
4 changes: 2 additions & 2 deletions apps/cli/fixtures/standalone/flutter/goldens/ast.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions apps/cli/fixtures/standalone/flutter/goldens/celest.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions apps/cli/lib/src/codegen/api/dockerfile_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ ENV PORT=8080
EXPOSE $PORT
''');

// TODO(dnys1): Remove `--platform=linux/amd64` when Celest supports arm64.
static const String _dartExeTemplate = r'''
# syntax=docker/dockerfile:1.2
FROM --platform=linux/amd64 celestdev/runtime:latest
FROM celestdev/runtime:latest

WORKDIR /app
COPY --chmod=755 main.exe .
Expand All @@ -46,17 +45,16 @@ ENV PORT=8080
EXPOSE $PORT
''';

// TODO(dnys1): Remove `--platform=linux/amd64` when Celest supports arm64.
static final Template _flutterTemplate = Template(r'''
# syntax=docker/dockerfile:1
FROM --platform=linux/amd64 celestdev/flutter-builder:{{version}} AS build
FROM celestdev/flutter-builder:{{version}} AS build

WORKDIR /app
COPY main.aot.dill .

RUN [ "/usr/lib/dart/bin/utils/gen_snapshot", "--snapshot_kind=app-aot-elf", "--elf=/app/main.aot", "/app/main.aot.dill" ]

FROM --platform=linux/amd64 celestdev/flutter-runtime:{{version}}
FROM celestdev/flutter-runtime:{{version}}

WORKDIR /app
COPY --from=build /app/main.aot main.aot
Expand Down