Skip to content

Commit 7b54bec

Browse files
kevmookevmoo
authored
use dart pub over just pub (#332)
1 parent e215026 commit 7b54bec

File tree

9 files changed

+54
-50
lines changed

9 files changed

+54
-50
lines changed

‎.github/workflows/dart.yml

+35-35
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Created with package:mono_repo v4.1.0
1+
# Created with package:mono_repo v4.2.0-dev
22
name: Dart CI
33
on:
44
push:
@@ -35,10 +35,10 @@ jobs:
3535
- id: checkout
3636
uses: actions/[email protected]
3737
- id: test_pkg_pub_upgrade
38-
name: test_pkg; pub upgrade
38+
name: test_pkg; dart pub upgrade
3939
if: "always() && steps.checkout.conclusion == 'success'"
4040
working-directory: test_pkg
41-
run: pub upgrade
41+
run: dart pub upgrade
4242
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
4343
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
4444
working-directory: test_pkg
@@ -67,10 +67,10 @@ jobs:
6767
- id: checkout
6868
uses: actions/[email protected]
6969
- id: test_pkg_pub_upgrade
70-
name: test_pkg; pub upgrade
70+
name: test_pkg; dart pub upgrade
7171
if: "always() && steps.checkout.conclusion == 'success'"
7272
working-directory: test_pkg
73-
run: pub upgrade
73+
run: dart pub upgrade
7474
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
7575
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
7676
working-directory: test_pkg
@@ -99,10 +99,10 @@ jobs:
9999
- id: checkout
100100
uses: actions/[email protected]
101101
- id: test_pkg_pub_upgrade
102-
name: test_pkg; pub upgrade
102+
name: test_pkg; dart pub upgrade
103103
if: "always() && steps.checkout.conclusion == 'success'"
104104
working-directory: test_pkg
105-
run: pub upgrade
105+
run: dart pub upgrade
106106
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
107107
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
108108
working-directory: test_pkg
@@ -131,10 +131,10 @@ jobs:
131131
- id: checkout
132132
uses: actions/[email protected]
133133
- id: mono_repo_pub_upgrade
134-
name: mono_repo; pub upgrade
134+
name: mono_repo; dart pub upgrade
135135
if: "always() && steps.checkout.conclusion == 'success'"
136136
working-directory: mono_repo
137-
run: pub upgrade
137+
run: dart pub upgrade
138138
- name: mono_repo; dart analyze
139139
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
140140
working-directory: mono_repo
@@ -159,10 +159,10 @@ jobs:
159159
- id: checkout
160160
uses: actions/[email protected]
161161
- id: test_pkg_pub_upgrade
162-
name: test_pkg; pub upgrade
162+
name: test_pkg; dart pub upgrade
163163
if: "always() && steps.checkout.conclusion == 'success'"
164164
working-directory: test_pkg
165-
run: pub upgrade
165+
run: dart pub upgrade
166166
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
167167
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
168168
working-directory: test_pkg
@@ -191,10 +191,10 @@ jobs:
191191
- id: checkout
192192
uses: actions/[email protected]
193193
- id: mono_repo_pub_upgrade
194-
name: mono_repo; pub upgrade
194+
name: mono_repo; dart pub upgrade
195195
if: "always() && steps.checkout.conclusion == 'success'"
196196
working-directory: mono_repo
197-
run: pub upgrade
197+
run: dart pub upgrade
198198
- name: "mono_repo; cd ../ && dart mono_repo/bin/mono_repo.dart generate --validate"
199199
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
200200
working-directory: mono_repo
@@ -219,10 +219,10 @@ jobs:
219219
- id: checkout
220220
uses: actions/[email protected]
221221
- id: mono_repo_pub_upgrade
222-
name: mono_repo; pub upgrade
222+
name: mono_repo; dart pub upgrade
223223
if: "always() && steps.checkout.conclusion == 'success'"
224224
working-directory: mono_repo
225-
run: pub upgrade
225+
run: dart pub upgrade
226226
- name: "mono_repo; dart format --output=none --set-exit-if-changed ."
227227
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
228228
working-directory: mono_repo
@@ -232,10 +232,10 @@ jobs:
232232
working-directory: mono_repo
233233
run: dart analyze --fatal-infos .
234234
- id: test_pkg_pub_upgrade
235-
name: test_pkg; pub upgrade
235+
name: test_pkg; dart pub upgrade
236236
if: "always() && steps.checkout.conclusion == 'success'"
237237
working-directory: test_pkg
238-
run: pub upgrade
238+
run: dart pub upgrade
239239
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
240240
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
241241
working-directory: test_pkg
@@ -264,10 +264,10 @@ jobs:
264264
- id: checkout
265265
uses: actions/[email protected]
266266
- id: test_pkg_pub_upgrade
267-
name: test_pkg; pub upgrade
267+
name: test_pkg; dart pub upgrade
268268
if: "always() && steps.checkout.conclusion == 'success'"
269269
working-directory: test_pkg
270-
run: pub upgrade
270+
run: dart pub upgrade
271271
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
272272
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
273273
working-directory: test_pkg
@@ -296,10 +296,10 @@ jobs:
296296
- id: checkout
297297
uses: actions/[email protected]
298298
- id: test_pkg_pub_upgrade
299-
name: test_pkg; pub upgrade
299+
name: test_pkg; dart pub upgrade
300300
if: "always() && steps.checkout.conclusion == 'success'"
301301
working-directory: test_pkg
302-
run: pub upgrade
302+
run: dart pub upgrade
303303
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
304304
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
305305
working-directory: test_pkg
@@ -328,10 +328,10 @@ jobs:
328328
- id: checkout
329329
uses: actions/[email protected]
330330
- id: mono_repo_pub_upgrade
331-
name: mono_repo; pub upgrade
331+
name: mono_repo; dart pub upgrade
332332
if: "always() && steps.checkout.conclusion == 'success'"
333333
working-directory: mono_repo
334-
run: pub upgrade
334+
run: dart pub upgrade
335335
- name: "mono_repo; dart test -t yaml --test-randomize-ordering-seed=random"
336336
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
337337
working-directory: mono_repo
@@ -366,10 +366,10 @@ jobs:
366366
- id: checkout
367367
uses: actions/[email protected]
368368
- id: mono_repo_pub_upgrade
369-
name: mono_repo; pub upgrade
369+
name: mono_repo; dart pub upgrade
370370
if: "always() && steps.checkout.conclusion == 'success'"
371371
working-directory: mono_repo
372-
run: pub upgrade
372+
run: dart pub upgrade
373373
- name: "mono_repo; dart test -x yaml -P presubmit --test-randomize-ordering-seed=random"
374374
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
375375
working-directory: mono_repo
@@ -404,10 +404,10 @@ jobs:
404404
- id: checkout
405405
uses: actions/[email protected]
406406
- id: mono_repo_pub_upgrade
407-
name: mono_repo; pub upgrade
407+
name: mono_repo; dart pub upgrade
408408
if: "always() && steps.checkout.conclusion == 'success'"
409409
working-directory: mono_repo
410-
run: pub upgrade
410+
run: dart pub upgrade
411411
- name: "mono_repo; dart test -t yaml --test-randomize-ordering-seed=random"
412412
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
413413
working-directory: mono_repo
@@ -442,10 +442,10 @@ jobs:
442442
- id: checkout
443443
uses: actions/[email protected]
444444
- id: mono_repo_pub_upgrade
445-
name: mono_repo; pub upgrade
445+
name: mono_repo; dart pub upgrade
446446
if: "always() && steps.checkout.conclusion == 'success'"
447447
working-directory: mono_repo
448-
run: pub upgrade
448+
run: dart pub upgrade
449449
- name: "mono_repo; dart test -x yaml -P presubmit --test-randomize-ordering-seed=random"
450450
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
451451
working-directory: mono_repo
@@ -480,10 +480,10 @@ jobs:
480480
- id: checkout
481481
uses: actions/[email protected]
482482
- id: test_pkg_pub_upgrade
483-
name: test_pkg; pub upgrade
483+
name: test_pkg; dart pub upgrade
484484
if: "always() && steps.checkout.conclusion == 'success'"
485485
working-directory: test_pkg
486-
run: pub upgrade
486+
run: dart pub upgrade
487487
- name: "test_pkg; dart test --test-randomize-ordering-seed=random"
488488
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
489489
working-directory: test_pkg
@@ -508,10 +508,10 @@ jobs:
508508
- id: checkout
509509
uses: actions/[email protected]
510510
- id: mono_repo_pub_upgrade
511-
name: mono_repo; pub.bat upgrade
511+
name: mono_repo; dart pub upgrade
512512
if: "always() && steps.checkout.conclusion == 'success'"
513513
working-directory: mono_repo
514-
run: pub.bat upgrade
514+
run: dart pub upgrade
515515
- name: "mono_repo; dart test -x yaml -P presubmit --test-randomize-ordering-seed=random"
516516
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
517517
working-directory: mono_repo
@@ -536,10 +536,10 @@ jobs:
536536
- id: checkout
537537
uses: actions/[email protected]
538538
- id: mono_repo_pub_upgrade
539-
name: mono_repo; pub.bat upgrade
539+
name: mono_repo; dart pub upgrade
540540
if: "always() && steps.checkout.conclusion == 'success'"
541541
working-directory: mono_repo
542-
run: pub.bat upgrade
542+
run: dart pub upgrade
543543
- name: "mono_repo; dart test -x yaml -P presubmit --test-randomize-ordering-seed=random"
544544
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
545545
working-directory: mono_repo

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Created with package:mono_repo v4.1.0
1+
# Created with package:mono_repo v4.2.0-dev
22
language: dart
33

44
jobs:

‎mono_repo/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 4.2.0-dev
2+
3+
- Change calls from `pub` to `dart pub` within generated scripts.
4+
15
## 4.1.0
26

37
- Improve the stability of ordering in Github workflow definitions.

‎mono_repo/lib/src/commands/github/github_yaml.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ extension on CIJobEntry {
258258
packages ??= [job.package];
259259
assert(packages.isNotEmpty);
260260
assert(packages.contains(job.package));
261-
final pubCommand = 'pub${job.os == 'windows' ? '.bat' : ''} '
261+
final pubCommand = 'dart pub '
262262
'${rootConfig.monoConfig.pubAction}';
263263

264264
final commandEntries = <_CommandEntry>[];

‎mono_repo/lib/src/version.dart

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mono_repo/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: mono_repo
22
description: >-
33
CLI tools to make it easier to manage a single source repository containing
44
multiple Dart packages.
5-
version: 4.1.0
5+
version: 4.2.0-dev
66
repository: https://github.com/google/mono_repo.dart
77

88
environment:

‎mono_repo/test/script_integration_outputs/readme_github_defaults.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
- id: checkout
3737
uses: actions/[email protected]
3838
- id: sub_pkg_pub_upgrade
39-
name: sub_pkg; pub upgrade
39+
name: sub_pkg; dart pub upgrade
4040
if: "always() && steps.checkout.conclusion == 'success'"
4141
working-directory: sub_pkg
42-
run: pub upgrade
42+
run: dart pub upgrade
4343
- name: sub_pkg; dart test
4444
if: "always() && steps.sub_pkg_pub_upgrade.conclusion == 'success'"
4545
working-directory: sub_pkg
@@ -64,10 +64,10 @@ jobs:
6464
- id: checkout
6565
uses: actions/[email protected]
6666
- id: sub_pkg_pub_upgrade
67-
name: sub_pkg; pub upgrade
67+
name: sub_pkg; dart pub upgrade
6868
if: "always() && steps.checkout.conclusion == 'success'"
6969
working-directory: sub_pkg
70-
run: pub upgrade
70+
run: dart pub upgrade
7171
- name: sub_pkg; dart test
7272
if: "always() && steps.sub_pkg_pub_upgrade.conclusion == 'success'"
7373
working-directory: sub_pkg
@@ -85,10 +85,10 @@ jobs:
8585
- id: checkout
8686
uses: actions/[email protected]
8787
- id: sub_pkg_pub_upgrade
88-
name: sub_pkg; pub.bat upgrade
88+
name: sub_pkg; dart pub upgrade
8989
if: "always() && steps.checkout.conclusion == 'success'"
9090
working-directory: sub_pkg
91-
run: pub.bat upgrade
91+
run: dart pub upgrade
9292
- name: sub_pkg; dart test
9393
if: "always() && steps.sub_pkg_pub_upgrade.conclusion == 'success'"
9494
working-directory: sub_pkg

‎mono_repo/test/script_integration_outputs/readme_github_lints.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ jobs:
5757
- id: checkout
5858
uses: actions/[email protected]
5959
- id: sub_pkg_pub_upgrade
60-
name: sub_pkg; pub upgrade
60+
name: sub_pkg; dart pub upgrade
6161
if: "always() && steps.checkout.conclusion == 'success'"
6262
working-directory: sub_pkg
63-
run: pub upgrade
63+
run: dart pub upgrade
6464
- name: sub_pkg; dart analyze
6565
if: "always() && steps.sub_pkg_pub_upgrade.conclusion == 'success'"
6666
working-directory: sub_pkg
@@ -85,10 +85,10 @@ jobs:
8585
- id: checkout
8686
uses: actions/[email protected]
8787
- id: sub_pkg_pub_upgrade
88-
name: sub_pkg; pub upgrade
88+
name: sub_pkg; dart pub upgrade
8989
if: "always() && steps.checkout.conclusion == 'success'"
9090
working-directory: sub_pkg
91-
run: pub upgrade
91+
run: dart pub upgrade
9292
- name: "sub_pkg; dart format --output=none --set-exit-if-changed ."
9393
if: "always() && steps.sub_pkg_pub_upgrade.conclusion == 'success'"
9494
working-directory: sub_pkg

‎tool/ci.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Created with package:mono_repo v4.1.0
2+
# Created with package:mono_repo v4.2.0-dev
33

44
# Support built in commands on windows out of the box.
55
# When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")

0 commit comments

Comments
 (0)