Skip to content

Commit 1cbc6bb

Browse files
committed
Fix travis tests
1 parent 099bdce commit 1cbc6bb

File tree

15 files changed

+20
-17
lines changed

15 files changed

+20
-17
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
dart: stable
1818
env: PKGS="canonical_json chunked_stream http_methods neat_periodic_task pem retry sanitize_html shelf_router shelf_router_generator slugid"
1919
script: ./tool/travis.sh dartfmt
20-
- stage: unit_test
20+
- stage: tests
2121
name: "SDK: stable; PKGS: canonical_json, chunked_stream, http_methods, neat_periodic_task, pem, retry, sanitize_html, shelf_router, shelf_router_generator, slugid; TASKS: `pub run test`"
2222
dart: stable
2323
env: PKGS="canonical_json chunked_stream http_methods neat_periodic_task pem retry sanitize_html shelf_router shelf_router_generator slugid"
2424
script: ./tool/travis.sh test
2525

2626
stages:
2727
- analyze
28-
- unit_test
28+
- tests
2929

3030
cache:
3131
directories:

canonical_json/lib/src/encoder.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void _encode(Uint8Buffer output, Object input, Object original) {
5959
original,
6060
'input',
6161
'canonical_json does not support encoding floats, input '
62-
'contained "$input"');
62+
'contained "$input"');
6363
}
6464
if (input.isNegative && input == 0) {
6565
throw ArgumentError.value(original, 'input',
@@ -106,5 +106,5 @@ void _encode(Uint8Buffer output, Object input, Object original) {
106106
original,
107107
'input',
108108
'canonical_json can only encode int, string, bool, list and maps, input '
109-
'contained type: "${input.runtimeType}"');
109+
'contained type: "${input.runtimeType}"');
110110
}

canonical_json/mono_pkg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ stages:
44
- analyze:
55
- dartanalyzer
66
- dartfmt
7-
- unit_test:
7+
- tests:
88
- test

chunked_stream/mono_pkg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ stages:
44
- analyze:
55
- dartanalyzer
66
- dartfmt
7-
- unit_test:
7+
- tests:
88
- test

http_methods/mono_pkg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ stages:
44
- analyze:
55
- dartanalyzer
66
- dartfmt
7-
- unit_test:
7+
- tests:
88
- test

mono_repo.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ travis:
44
branches:
55
exclude: []
66

7-
merge_stages: [analyze, unit_test]
7+
# Ensure that all analysis and tests tasks runs in the same job.
8+
merge_stages:
9+
- analyze
10+
- tests

neat_periodic_task/mono_pkg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ stages:
44
- analyze:
55
- dartanalyzer
66
- dartfmt
7-
- unit_test:
7+
- tests:
88
- test

pem/mono_pkg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ stages:
44
- analyze:
55
- dartanalyzer
66
- dartfmt
7-
- unit_test:
7+
- tests:
88
- test

pubspec.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ packages:
5656
name: mono_repo
5757
url: "https://pub.dartlang.org"
5858
source: hosted
59-
version: "1.2.2"
59+
version: "2.1.0"
6060
path:
6161
dependency: transitive
6262
description:

pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ name: dart_neats
33
# repository management, so they don't have to be installed globally.
44
publish_to: none
55
dev_dependencies:
6-
mono_repo: ^1.2.1
6+
mono_repo: ^2.1.0
77
pubspec_parse: ^0.1.4

retry/mono_pkg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ stages:
44
- analyze:
55
- dartanalyzer
66
- dartfmt
7-
- unit_test:
7+
- tests:
88
- test

sanitize_html/mono_pkg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ stages:
44
- analyze:
55
- dartanalyzer
66
- dartfmt
7-
- unit_test:
7+
- tests:
88
- test

shelf_router/mono_pkg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ stages:
44
- analyze:
55
- dartanalyzer
66
- dartfmt
7-
- unit_test:
7+
- tests:
88
- test

shelf_router_generator/mono_pkg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ stages:
44
- analyze:
55
- dartanalyzer
66
- dartfmt
7-
- unit_test:
7+
- tests:
88
- test

slugid/mono_pkg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ stages:
44
- analyze:
55
- dartanalyzer
66
- dartfmt
7-
- unit_test:
7+
- tests:
88
- test

0 commit comments

Comments
 (0)