From 42f2a08edcbf1b74e3699c08ae51c6aa87aafa0a Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 14 Dec 2020 08:36:38 -0800 Subject: [PATCH] Trying out new SDK setup --- .github/workflows/dart.yml | 34 +++++++++---------- .travis.yml | 2 +- .../lib/src/commands/github/github_yaml.dart | 2 +- mono_repo/lib/src/version.dart | 2 +- mono_repo/pubspec.yaml | 2 +- tool/ci.sh | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index ec6fcdbd..23c5df46 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v3.4.2 +# Created with package:mono_repo v3.4.3-dev name: Dart CI on: push: @@ -29,7 +29,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: dev - run: dart --version @@ -56,7 +56,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: dev - run: dart --version @@ -99,7 +99,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:2.7.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: stable version: "2.7.0" @@ -127,7 +127,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:edge os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: edge - run: dart --version @@ -158,7 +158,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:2.12.0-0.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: dev version: "2.12.0-0.0.dev" @@ -190,7 +190,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:beta os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: beta - run: dart --version @@ -221,7 +221,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:2.12.0-29.10.beta os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: beta version: "2.12.0-29.10.beta" @@ -253,7 +253,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:stable os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: stable - run: dart --version @@ -284,7 +284,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:2.10.4 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: stable version: "2.10.4" @@ -316,7 +316,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:2.7.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: stable version: "2.7.0" @@ -344,7 +344,7 @@ jobs: name: "unit_test; windows; Dart 2.7.0; PKG: mono_repo; `pub run test -x yaml -P presubmit --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: stable version: "2.7.0" @@ -382,7 +382,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: dev - run: dart --version @@ -409,7 +409,7 @@ jobs: name: "unit_test; windows; Dart dev; PKG: mono_repo; `pub run test -x yaml -P presubmit --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: dev - run: dart --version @@ -446,7 +446,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:2.7.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: stable version: "2.7.0" @@ -484,7 +484,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: dev - run: dart --version @@ -521,7 +521,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted;dart:dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - - uses: cedx/setup-dart@v2 + - uses: dart-lang/setup-dart@v0.1 with: release-channel: dev - run: dart --version diff --git a/.travis.yml b/.travis.yml index 9aa48415..63d4d6af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v3.4.2 +# Created with package:mono_repo v3.4.3-dev language: dart jobs: diff --git a/mono_repo/lib/src/commands/github/github_yaml.dart b/mono_repo/lib/src/commands/github/github_yaml.dart index 677ac063..b6f5454e 100644 --- a/mono_repo/lib/src/commands/github/github_yaml.dart +++ b/mono_repo/lib/src/commands/github/github_yaml.dart @@ -338,7 +338,7 @@ Map _createDartSetup(String sdk) { } final map = { - 'uses': 'cedx/setup-dart@v2', + 'uses': 'dart-lang/setup-dart@v0.1', 'with': withMap, }; diff --git a/mono_repo/lib/src/version.dart b/mono_repo/lib/src/version.dart index 58d03162..6cc10530 100644 --- a/mono_repo/lib/src/version.dart +++ b/mono_repo/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '3.4.2'; +const packageVersion = '3.4.3-dev'; diff --git a/mono_repo/pubspec.yaml b/mono_repo/pubspec.yaml index 124bc0ac..d12b4cbf 100644 --- a/mono_repo/pubspec.yaml +++ b/mono_repo/pubspec.yaml @@ -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: 3.4.2 +version: 3.4.3-dev repository: https://github.com/google/mono_repo.dart environment: diff --git a/tool/ci.sh b/tool/ci.sh index 6f0b3e59..f941da3d 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created with package:mono_repo v3.4.2 +# Created with package:mono_repo v3.4.3-dev # Support built in commands on windows out of the box. function pub() {