Skip to content

Commit

Permalink
in-line shared libraries into dart_services (#2677)
Browse files Browse the repository at this point in the history
* in-line shared libraries into dart_services

* don't show copied code in PRs
  • Loading branch information
devoncarew committed Oct 16, 2023
1 parent c12d602 commit e8c2801
Show file tree
Hide file tree
Showing 14 changed files with 494 additions and 25 deletions.
12 changes: 5 additions & 7 deletions .cloud_build/dart-services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ To deploy a new version manually, run:

```
gcloud builds submit \
--config $FLUTTER_CHANNEL.yaml \
--project=dart-services \
--substitutions \
REPO_NAME=dart-pad \
COMMIT_SHA=$COMMIT_SHA
--config $FLUTTER_CHANNEL.yaml \
--project=dart-services \
--substitutions REPO_NAME=dart-pad COMMIT_SHA=$COMMIT_SHA
```

Where `$FLUTTER_CHANNEL` is `stable`, `beta`, `main`, or `old`. The REPO_NAME
and COMMIT_SHA are for adding tags to the Docker image.
Where `$FLUTTER_CHANNEL` is `stable`, `beta`, or `main`. The REPO_NAME and
COMMIT_SHA are for adding tags to the Docker image.
2 changes: 1 addition & 1 deletion .cloud_build/dart-services/stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ steps:
- '$_GCR_HOSTNAME/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'
- .
- '-f'
- cloud_run.Dockerfile
- cloud_run_stable.Dockerfile
id: Build
dir: pkgs/dart_services
- name: gcr.io/cloud-builders/docker
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
pkgs/dart_pad/lib/src/protos/** linguist-generated=true
pkgs/dart_services/lib/src/shared/** linguist-generated=true
pkgs/sketch_pad/web/codemirror/** linguist-generated=true
File renamed without changes.
2 changes: 1 addition & 1 deletion pkgs/dart_services/lib/src/analysis_server.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import 'dart:convert';

import 'package:analysis_server_lib/analysis_server_lib.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:dartpad_shared/model.dart' as api;
import 'package:logging/logging.dart';
import 'package:path/path.dart' as path;

import 'common.dart';
import 'project.dart';
import 'protos/dart_services.pb.dart' as proto;
import 'pub.dart';
import 'shared/model.dart' as api;
import 'utils.dart' as utils;

final Logger _logger = Logger('analysis_server');
Expand Down
2 changes: 1 addition & 1 deletion pkgs/dart_services/lib/src/analyzer_wrapper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'dart:async';
import 'dart:io';

import 'package:analyzer/dart/ast/ast.dart';
import 'package:dartpad_shared/model.dart' as api;
import 'package:logging/logging.dart';

import 'analysis_server.dart';
Expand All @@ -18,6 +17,7 @@ import 'common_server_impl.dart' show BadRequest;
import 'project.dart' as project;
import 'protos/dart_services.pb.dart' as proto;
import 'pub.dart';
import 'shared/model.dart' as api;

final Logger _logger = Logger('analysis_servers');

Expand Down
2 changes: 1 addition & 1 deletion pkgs/dart_services/lib/src/common_server_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import 'dart:async';
import 'dart:convert';

import 'package:dartpad_shared/model.dart' as api;
import 'package:logging/logging.dart';
import 'package:meta/meta.dart';
import 'package:protobuf/protobuf.dart';
Expand All @@ -17,6 +16,7 @@ import 'project.dart';
import 'protos/dart_services.pb.dart' as proto;
import 'pub.dart';
import 'scheduler.dart';
import 'shared/model.dart' as api;
import 'shelf_cors.dart' as shelf_cors;

export 'common_server_impl.dart' show log;
Expand Down
204 changes: 204 additions & 0 deletions pkgs/dart_services/lib/src/shared/model.dart

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

Loading

0 comments on commit e8c2801

Please sign in to comment.