Skip to content

Commit 6c14f73

Browse files
kevmookevmoo
committed
Merge branch 'pre_nnbd' into merge_master
# Conflicts: # .github/workflows/dart.yml # checked_yaml/CHANGELOG.md # checked_yaml/pubspec.yaml
2 parents c1c1d82 + 3b68dbb commit 6c14f73

File tree

6 files changed

+153
-30
lines changed

6 files changed

+153
-30
lines changed

‎.github/workflows/dart.yml

Lines changed: 144 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Created with package:mono_repo v3.3.0
1+
# Created with package:mono_repo v3.4.1
22
name: Dart CI
33
on:
44
push:
@@ -30,13 +30,14 @@ jobs:
3030
- uses: cedx/setup-dart@v2
3131
with:
3232
release-channel: stable
33-
version: latest
3433
- run: dart --version
3534
- uses: actions/checkout@v2
36-
- run: pub global activate mono_repo 3.3.0
37-
- run: pub global run mono_repo generate --validate
35+
- name: mono_repo self validate
36+
run: pub global activate mono_repo 3.4.1
37+
- name: mono_repo self validate
38+
run: pub global run mono_repo generate --validate
3839
job_002:
39-
name: "OS: linux; SDK: dev; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; TASKS: [`dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`]"
40+
name: "analyzer_and_format; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
4041
runs-on: ubuntu-latest
4142
steps:
4243
- name: Cache Pub hosted dependencies
@@ -54,12 +55,68 @@ jobs:
5455
release-channel: dev
5556
- run: dart --version
5657
- uses: actions/checkout@v2
57-
- env:
58-
PKGS: _test_yaml checked_yaml example json_annotation json_serializable
59-
TRAVIS_OS_NAME: linux
60-
run: tool/ci.sh dartfmt dartanalyzer
58+
- id: _test_yaml_pub_upgrade
59+
name: "_test_yaml; pub upgrade --no-precompile"
60+
working-directory: _test_yaml
61+
run: pub upgrade --no-precompile
62+
- name: "_test_yaml; dartfmt -n --set-exit-if-changed ."
63+
if: "steps._test_yaml_pub_upgrade.conclusion == 'success'"
64+
working-directory: _test_yaml
65+
run: dartfmt -n --set-exit-if-changed .
66+
- name: "_test_yaml; dartanalyzer --fatal-infos ."
67+
if: "steps._test_yaml_pub_upgrade.conclusion == 'success'"
68+
working-directory: _test_yaml
69+
run: dartanalyzer --fatal-infos .
70+
- id: checked_yaml_pub_upgrade
71+
name: "checked_yaml; pub upgrade --no-precompile"
72+
working-directory: checked_yaml
73+
run: pub upgrade --no-precompile
74+
- name: "checked_yaml; dartfmt -n --set-exit-if-changed ."
75+
if: "steps.checked_yaml_pub_upgrade.conclusion == 'success'"
76+
working-directory: checked_yaml
77+
run: dartfmt -n --set-exit-if-changed .
78+
- name: "checked_yaml; dartanalyzer --fatal-infos ."
79+
if: "steps.checked_yaml_pub_upgrade.conclusion == 'success'"
80+
working-directory: checked_yaml
81+
run: dartanalyzer --fatal-infos .
82+
- id: example_pub_upgrade
83+
name: "example; pub upgrade --no-precompile"
84+
working-directory: example
85+
run: pub upgrade --no-precompile
86+
- name: "example; dartfmt -n --set-exit-if-changed ."
87+
if: "steps.example_pub_upgrade.conclusion == 'success'"
88+
working-directory: example
89+
run: dartfmt -n --set-exit-if-changed .
90+
- name: "example; dartanalyzer --fatal-infos ."
91+
if: "steps.example_pub_upgrade.conclusion == 'success'"
92+
working-directory: example
93+
run: dartanalyzer --fatal-infos .
94+
- id: json_annotation_pub_upgrade
95+
name: "json_annotation; pub upgrade --no-precompile"
96+
working-directory: json_annotation
97+
run: pub upgrade --no-precompile
98+
- name: "json_annotation; dartfmt -n --set-exit-if-changed ."
99+
if: "steps.json_annotation_pub_upgrade.conclusion == 'success'"
100+
working-directory: json_annotation
101+
run: dartfmt -n --set-exit-if-changed .
102+
- name: "json_annotation; dartanalyzer --fatal-infos ."
103+
if: "steps.json_annotation_pub_upgrade.conclusion == 'success'"
104+
working-directory: json_annotation
105+
run: dartanalyzer --fatal-infos .
106+
- id: json_serializable_pub_upgrade
107+
name: "json_serializable; pub upgrade --no-precompile"
108+
working-directory: json_serializable
109+
run: pub upgrade --no-precompile
110+
- name: "json_serializable; dartfmt -n --set-exit-if-changed ."
111+
if: "steps.json_serializable_pub_upgrade.conclusion == 'success'"
112+
working-directory: json_serializable
113+
run: dartfmt -n --set-exit-if-changed .
114+
- name: "json_serializable; dartanalyzer --fatal-infos ."
115+
if: "steps.json_serializable_pub_upgrade.conclusion == 'success'"
116+
working-directory: json_serializable
117+
run: dartanalyzer --fatal-infos .
61118
job_003:
62-
name: "OS: linux; SDK: dev; PKGS: _test_yaml, checked_yaml, example, json_serializable; TASKS: `pub run test`"
119+
name: "unit_test; PKGS: _test_yaml, checked_yaml, example, json_serializable; `pub run test`"
63120
runs-on: ubuntu-latest
64121
steps:
65122
- name: Cache Pub hosted dependencies
@@ -77,15 +134,43 @@ jobs:
77134
release-channel: dev
78135
- run: dart --version
79136
- uses: actions/checkout@v2
80-
- env:
81-
PKGS: _test_yaml checked_yaml example json_serializable
82-
TRAVIS_OS_NAME: linux
83-
run: tool/ci.sh test_0
137+
- id: _test_yaml_pub_upgrade
138+
name: "_test_yaml; pub upgrade --no-precompile"
139+
working-directory: _test_yaml
140+
run: pub upgrade --no-precompile
141+
- name: _test_yaml; pub run test
142+
if: "steps._test_yaml_pub_upgrade.conclusion == 'success'"
143+
working-directory: _test_yaml
144+
run: pub run test
145+
- id: checked_yaml_pub_upgrade
146+
name: "checked_yaml; pub upgrade --no-precompile"
147+
working-directory: checked_yaml
148+
run: pub upgrade --no-precompile
149+
- name: checked_yaml; pub run test
150+
if: "steps.checked_yaml_pub_upgrade.conclusion == 'success'"
151+
working-directory: checked_yaml
152+
run: pub run test
153+
- id: example_pub_upgrade
154+
name: "example; pub upgrade --no-precompile"
155+
working-directory: example
156+
run: pub upgrade --no-precompile
157+
- name: example; pub run test
158+
if: "steps.example_pub_upgrade.conclusion == 'success'"
159+
working-directory: example
160+
run: pub run test
161+
- id: json_serializable_pub_upgrade
162+
name: "json_serializable; pub upgrade --no-precompile"
163+
working-directory: json_serializable
164+
run: pub upgrade --no-precompile
165+
- name: json_serializable; pub run test
166+
if: "steps.json_serializable_pub_upgrade.conclusion == 'success'"
167+
working-directory: json_serializable
168+
run: pub run test
84169
needs:
85170
- job_001
86171
- job_002
87-
job_005:
88-
name: "OS: linux; SDK: dev; PKG: json_serializable; TASKS: `pub run test -p chrome`"
172+
job_004:
173+
name: "unit_test; PKG: json_serializable; `pub run test -p chrome`"
89174
runs-on: ubuntu-latest
90175
steps:
91176
- name: Cache Pub hosted dependencies
@@ -103,15 +188,19 @@ jobs:
103188
release-channel: dev
104189
- run: dart --version
105190
- uses: actions/checkout@v2
106-
- env:
107-
PKGS: json_serializable
108-
TRAVIS_OS_NAME: linux
109-
run: tool/ci.sh test_2
191+
- id: json_serializable_pub_upgrade
192+
name: "json_serializable; pub upgrade --no-precompile"
193+
working-directory: json_serializable
194+
run: pub upgrade --no-precompile
195+
- name: "json_serializable; pub run test -p chrome"
196+
if: "steps.json_serializable_pub_upgrade.conclusion == 'success'"
197+
working-directory: json_serializable
198+
run: pub run test -p chrome
110199
needs:
111200
- job_001
112201
- job_002
113-
job_004:
114-
name: "OS: linux; SDK: dev; PKGS: _test_yaml, checked_yaml, example, json_serializable; TASKS: `pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
202+
job_005:
203+
name: "ensure_build; PKGS: _test_yaml, checked_yaml, example, json_serializable; `pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
115204
runs-on: ubuntu-latest
116205
steps:
117206
- name: Cache Pub hosted dependencies
@@ -129,10 +218,38 @@ jobs:
129218
release-channel: dev
130219
- run: dart --version
131220
- uses: actions/checkout@v2
132-
- env:
133-
PKGS: _test_yaml checked_yaml example json_serializable
134-
TRAVIS_OS_NAME: linux
135-
run: tool/ci.sh test_1
221+
- id: _test_yaml_pub_upgrade
222+
name: "_test_yaml; pub upgrade --no-precompile"
223+
working-directory: _test_yaml
224+
run: pub upgrade --no-precompile
225+
- name: "_test_yaml; pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart"
226+
if: "steps._test_yaml_pub_upgrade.conclusion == 'success'"
227+
working-directory: _test_yaml
228+
run: pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart
229+
- id: checked_yaml_pub_upgrade
230+
name: "checked_yaml; pub upgrade --no-precompile"
231+
working-directory: checked_yaml
232+
run: pub upgrade --no-precompile
233+
- name: "checked_yaml; pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart"
234+
if: "steps.checked_yaml_pub_upgrade.conclusion == 'success'"
235+
working-directory: checked_yaml
236+
run: pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart
237+
- id: example_pub_upgrade
238+
name: "example; pub upgrade --no-precompile"
239+
working-directory: example
240+
run: pub upgrade --no-precompile
241+
- name: "example; pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart"
242+
if: "steps.example_pub_upgrade.conclusion == 'success'"
243+
working-directory: example
244+
run: pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart
245+
- id: json_serializable_pub_upgrade
246+
name: "json_serializable; pub upgrade --no-precompile"
247+
working-directory: json_serializable
248+
run: pub upgrade --no-precompile
249+
- name: "json_serializable; pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart"
250+
if: "steps.json_serializable_pub_upgrade.conclusion == 'success'"
251+
working-directory: json_serializable
252+
run: pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart
136253
needs:
137254
- job_003
138-
- job_005
255+
- job_004

‎checked_yaml/changelog.md renamed to ‎checked_yaml/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
- *BREAKING* `checkedYamlDecode` `sourceUrl` parameter is now a `Uri`.
44
- Require at least Dart `2.12.0-0`.
55

6+
## 1.0.3
7+
8+
- Require at least Dart `2.7.0`.
9+
- Allow `package:json_annotation` `v4.x`.
10+
611
## 1.0.2
712

813
- Require at least Dart `2.3.0`.

‎checked_yaml/readme.md renamed to ‎checked_yaml/README.md

File renamed without changes.

‎checked_yaml/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: checked_yaml
22
version: 1.9.0-nullsafety-dev
3+
34
description: >-
45
Generate more helpful exceptions when decoding YAML documents using
56
package:json_serializable and package:yaml.
@@ -8,7 +9,7 @@ environment:
89
sdk: '>=2.12.0-0 <3.0.0'
910

1011
dependencies:
11-
json_annotation: '>=2.2.0 <4.0.0'
12+
json_annotation: '>=2.2.0 <5.0.0'
1213
source_span: ^1.8.0-nullsafety.4
1314
yaml: ^3.0.0-nullsafety.0
1415

‎checked_yaml/test/readme_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:test_process/test_process.dart';
1313

1414
final _examplePath = p.join('example', 'example.dart');
1515

16-
final _readmeContent = File('readme.md').readAsStringSync();
16+
final _readmeContent = File('README.md').readAsStringSync();
1717
final _exampleContent = File(_examplePath).readAsStringSync();
1818

1919
const _memberEnd = '\n}';

‎tool/ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Created with package:mono_repo v3.3.0
2+
# Created with package:mono_repo v3.4.1
33

44
# Support built in commands on windows out of the box.
55
function pub() {

0 commit comments

Comments
 (0)