Skip to content

Commit

Permalink
use dart pub over just pub (#332)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevmoo authored Jun 7, 2021
1 parent e215026 commit 7b54bec
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 50 deletions.
70 changes: 35 additions & 35 deletions .github/workflows/dart.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Created with package:mono_repo v4.1.0
# Created with package:mono_repo v4.2.0-dev
name: Dart CI
on:
push:
Expand Down Expand Up @@ -35,10 +35,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: test_pkg_pub_upgrade
name: test_pkg; pub upgrade
name: test_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: test_pkg
run: pub upgrade
run: dart pub upgrade
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
working-directory: test_pkg
Expand Down Expand Up @@ -67,10 +67,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: test_pkg_pub_upgrade
name: test_pkg; pub upgrade
name: test_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: test_pkg
run: pub upgrade
run: dart pub upgrade
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
working-directory: test_pkg
Expand Down Expand Up @@ -99,10 +99,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: test_pkg_pub_upgrade
name: test_pkg; pub upgrade
name: test_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: test_pkg
run: pub upgrade
run: dart pub upgrade
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
working-directory: test_pkg
Expand Down Expand Up @@ -131,10 +131,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: mono_repo_pub_upgrade
name: mono_repo; pub upgrade
name: mono_repo; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: mono_repo
run: pub upgrade
run: dart pub upgrade
- name: mono_repo; dart analyze
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
working-directory: mono_repo
Expand All @@ -159,10 +159,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: test_pkg_pub_upgrade
name: test_pkg; pub upgrade
name: test_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: test_pkg
run: pub upgrade
run: dart pub upgrade
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
working-directory: test_pkg
Expand Down Expand Up @@ -191,10 +191,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: mono_repo_pub_upgrade
name: mono_repo; pub upgrade
name: mono_repo; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: mono_repo
run: pub upgrade
run: dart pub upgrade
- name: "mono_repo; cd ../ && dart mono_repo/bin/mono_repo.dart generate --validate"
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
working-directory: mono_repo
Expand All @@ -219,10 +219,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: mono_repo_pub_upgrade
name: mono_repo; pub upgrade
name: mono_repo; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: mono_repo
run: pub upgrade
run: dart pub upgrade
- name: "mono_repo; dart format --output=none --set-exit-if-changed ."
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
working-directory: mono_repo
Expand All @@ -232,10 +232,10 @@ jobs:
working-directory: mono_repo
run: dart analyze --fatal-infos .
- id: test_pkg_pub_upgrade
name: test_pkg; pub upgrade
name: test_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: test_pkg
run: pub upgrade
run: dart pub upgrade
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
working-directory: test_pkg
Expand Down Expand Up @@ -264,10 +264,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: test_pkg_pub_upgrade
name: test_pkg; pub upgrade
name: test_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: test_pkg
run: pub upgrade
run: dart pub upgrade
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
working-directory: test_pkg
Expand Down Expand Up @@ -296,10 +296,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: test_pkg_pub_upgrade
name: test_pkg; pub upgrade
name: test_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: test_pkg
run: pub upgrade
run: dart pub upgrade
- name: "test_pkg; dart format --output=none --set-exit-if-changed ."
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
working-directory: test_pkg
Expand Down Expand Up @@ -328,10 +328,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: mono_repo_pub_upgrade
name: mono_repo; pub upgrade
name: mono_repo; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: mono_repo
run: pub upgrade
run: dart pub upgrade
- name: "mono_repo; dart test -t yaml --test-randomize-ordering-seed=random"
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
working-directory: mono_repo
Expand Down Expand Up @@ -366,10 +366,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: mono_repo_pub_upgrade
name: mono_repo; pub upgrade
name: mono_repo; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: mono_repo
run: pub upgrade
run: dart pub upgrade
- name: "mono_repo; dart test -x yaml -P presubmit --test-randomize-ordering-seed=random"
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
working-directory: mono_repo
Expand Down Expand Up @@ -404,10 +404,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: mono_repo_pub_upgrade
name: mono_repo; pub upgrade
name: mono_repo; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: mono_repo
run: pub upgrade
run: dart pub upgrade
- name: "mono_repo; dart test -t yaml --test-randomize-ordering-seed=random"
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
working-directory: mono_repo
Expand Down Expand Up @@ -442,10 +442,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: mono_repo_pub_upgrade
name: mono_repo; pub upgrade
name: mono_repo; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: mono_repo
run: pub upgrade
run: dart pub upgrade
- name: "mono_repo; dart test -x yaml -P presubmit --test-randomize-ordering-seed=random"
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
working-directory: mono_repo
Expand Down Expand Up @@ -480,10 +480,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: test_pkg_pub_upgrade
name: test_pkg; pub upgrade
name: test_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: test_pkg
run: pub upgrade
run: dart pub upgrade
- name: "test_pkg; dart test --test-randomize-ordering-seed=random"
if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'"
working-directory: test_pkg
Expand All @@ -508,10 +508,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: mono_repo_pub_upgrade
name: mono_repo; pub.bat upgrade
name: mono_repo; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: mono_repo
run: pub.bat upgrade
run: dart pub upgrade
- name: "mono_repo; dart test -x yaml -P presubmit --test-randomize-ordering-seed=random"
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
working-directory: mono_repo
Expand All @@ -536,10 +536,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: mono_repo_pub_upgrade
name: mono_repo; pub.bat upgrade
name: mono_repo; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: mono_repo
run: pub.bat upgrade
run: dart pub upgrade
- name: "mono_repo; dart test -x yaml -P presubmit --test-randomize-ordering-seed=random"
if: "always() && steps.mono_repo_pub_upgrade.conclusion == 'success'"
working-directory: mono_repo
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Created with package:mono_repo v4.1.0
# Created with package:mono_repo v4.2.0-dev
language: dart

jobs:
Expand Down
4 changes: 4 additions & 0 deletions mono_repo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 4.2.0-dev

- Change calls from `pub` to `dart pub` within generated scripts.

## 4.1.0

- Improve the stability of ordering in Github workflow definitions.
Expand Down
2 changes: 1 addition & 1 deletion mono_repo/lib/src/commands/github/github_yaml.dart
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ extension on CIJobEntry {
packages ??= [job.package];
assert(packages.isNotEmpty);
assert(packages.contains(job.package));
final pubCommand = 'pub${job.os == 'windows' ? '.bat' : ''} '
final pubCommand = 'dart pub '
'${rootConfig.monoConfig.pubAction}';

final commandEntries = <_CommandEntry>[];
Expand Down
2 changes: 1 addition & 1 deletion mono_repo/lib/src/version.dart

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

2 changes: 1 addition & 1 deletion mono_repo/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: mono_repo
description: >-
CLI tools to make it easier to manage a single source repository containing
multiple Dart packages.
version: 4.1.0
version: 4.2.0-dev
repository: https://github.com/google/mono_repo.dart

environment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: sub_pkg_pub_upgrade
name: sub_pkg; pub upgrade
name: sub_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: sub_pkg
run: pub upgrade
run: dart pub upgrade
- name: sub_pkg; dart test
if: "always() && steps.sub_pkg_pub_upgrade.conclusion == 'success'"
working-directory: sub_pkg
Expand All @@ -64,10 +64,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: sub_pkg_pub_upgrade
name: sub_pkg; pub upgrade
name: sub_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: sub_pkg
run: pub upgrade
run: dart pub upgrade
- name: sub_pkg; dart test
if: "always() && steps.sub_pkg_pub_upgrade.conclusion == 'success'"
working-directory: sub_pkg
Expand All @@ -85,10 +85,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: sub_pkg_pub_upgrade
name: sub_pkg; pub.bat upgrade
name: sub_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: sub_pkg
run: pub.bat upgrade
run: dart pub upgrade
- name: sub_pkg; dart test
if: "always() && steps.sub_pkg_pub_upgrade.conclusion == 'success'"
working-directory: sub_pkg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: sub_pkg_pub_upgrade
name: sub_pkg; pub upgrade
name: sub_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: sub_pkg
run: pub upgrade
run: dart pub upgrade
- name: sub_pkg; dart analyze
if: "always() && steps.sub_pkg_pub_upgrade.conclusion == 'success'"
working-directory: sub_pkg
Expand All @@ -85,10 +85,10 @@ jobs:
- id: checkout
uses: actions/[email protected]
- id: sub_pkg_pub_upgrade
name: sub_pkg; pub upgrade
name: sub_pkg; dart pub upgrade
if: "always() && steps.checkout.conclusion == 'success'"
working-directory: sub_pkg
run: pub upgrade
run: dart pub upgrade
- name: "sub_pkg; dart format --output=none --set-exit-if-changed ."
if: "always() && steps.sub_pkg_pub_upgrade.conclusion == 'success'"
working-directory: sub_pkg
Expand Down
2 changes: 1 addition & 1 deletion tool/ci.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Created with package:mono_repo v4.1.0
# Created with package:mono_repo v4.2.0-dev

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

0 comments on commit 7b54bec

Please sign in to comment.