Skip to content

Commit fffb81a

Browse files
committed
Update to Dart 3.3 to match repo
1 parent ea031fc commit fffb81a

File tree

2 files changed

+33
-82
lines changed

2 files changed

+33
-82
lines changed

.github/workflows/dart.yml

+31-80
Original file line numberDiff line numberDiff line change
@@ -39,50 +39,16 @@ jobs:
3939
- name: mono_repo self validate
4040
run: dart pub global run mono_repo generate --validate
4141
job_002:
42-
name: "analyzer_and_format; Dart 3.2.0; PKG: packages/excerpter; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
42+
name: "analyzer_and_format; Dart 3.3.0; PKGS: packages/code_excerpt_updater, packages/code_excerpter, packages/excerpter, packages/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Cache Pub hosted dependencies
4646
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
4747
with:
4848
path: "~/.pub-cache/hosted"
49-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:packages/excerpter;commands:format-analyze"
49+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/excerpter-packages/inject_dartpad;commands:format-analyze"
5050
restore-keys: |
51-
os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:packages/excerpter
52-
os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
53-
os:ubuntu-latest;pub-cache-hosted
54-
os:ubuntu-latest
55-
- name: Setup Dart SDK
56-
uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
57-
with:
58-
sdk: "3.2.0"
59-
- id: checkout
60-
name: Checkout repository
61-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
62-
- id: packages_excerpter_pub_upgrade
63-
name: packages/excerpter; dart pub upgrade
64-
run: dart pub upgrade
65-
if: "always() && steps.checkout.conclusion == 'success'"
66-
working-directory: packages/excerpter
67-
- name: "packages/excerpter; dart format --output=none --set-exit-if-changed ."
68-
run: "dart format --output=none --set-exit-if-changed ."
69-
if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
70-
working-directory: packages/excerpter
71-
- name: "packages/excerpter; dart analyze --fatal-infos ."
72-
run: dart analyze --fatal-infos .
73-
if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
74-
working-directory: packages/excerpter
75-
job_003:
76-
name: "analyzer_and_format; Dart 3.3.0; PKGS: packages/code_excerpt_updater, packages/code_excerpter, packages/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
77-
runs-on: ubuntu-latest
78-
steps:
79-
- name: Cache Pub hosted dependencies
80-
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
81-
with:
82-
path: "~/.pub-cache/hosted"
83-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/inject_dartpad;commands:format-analyze"
84-
restore-keys: |
85-
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/inject_dartpad
51+
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/excerpter-packages/inject_dartpad
8652
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
8753
os:ubuntu-latest;pub-cache-hosted
8854
os:ubuntu-latest
@@ -119,6 +85,19 @@ jobs:
11985
run: dart analyze --fatal-infos .
12086
if: "always() && steps.packages_code_excerpter_pub_upgrade.conclusion == 'success'"
12187
working-directory: packages/code_excerpter
88+
- id: packages_excerpter_pub_upgrade
89+
name: packages/excerpter; dart pub upgrade
90+
run: dart pub upgrade
91+
if: "always() && steps.checkout.conclusion == 'success'"
92+
working-directory: packages/excerpter
93+
- name: "packages/excerpter; dart format --output=none --set-exit-if-changed ."
94+
run: "dart format --output=none --set-exit-if-changed ."
95+
if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
96+
working-directory: packages/excerpter
97+
- name: "packages/excerpter; dart analyze --fatal-infos ."
98+
run: dart analyze --fatal-infos .
99+
if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
100+
working-directory: packages/excerpter
122101
- id: packages_inject_dartpad_pub_upgrade
123102
name: packages/inject_dartpad; dart pub upgrade
124103
run: dart pub upgrade
@@ -132,7 +111,7 @@ jobs:
132111
run: dart analyze --fatal-infos .
133112
if: "always() && steps.packages_inject_dartpad_pub_upgrade.conclusion == 'success'"
134113
working-directory: packages/inject_dartpad
135-
job_004:
114+
job_003:
136115
name: "analyzer_and_format; Dart dev; PKGS: packages/code_excerpt_updater, packages/code_excerpter, packages/excerpter, packages/inject_dartpad; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
137116
runs-on: ubuntu-latest
138117
steps:
@@ -205,52 +184,17 @@ jobs:
205184
run: dart analyze --fatal-infos .
206185
if: "always() && steps.packages_inject_dartpad_pub_upgrade.conclusion == 'success'"
207186
working-directory: packages/inject_dartpad
208-
job_005:
209-
name: "unit_test; Dart 3.2.0; PKG: packages/excerpter; `dart test`"
210-
runs-on: ubuntu-latest
211-
steps:
212-
- name: Cache Pub hosted dependencies
213-
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
214-
with:
215-
path: "~/.pub-cache/hosted"
216-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:packages/excerpter;commands:test"
217-
restore-keys: |
218-
os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:packages/excerpter
219-
os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
220-
os:ubuntu-latest;pub-cache-hosted
221-
os:ubuntu-latest
222-
- name: Setup Dart SDK
223-
uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
224-
with:
225-
sdk: "3.2.0"
226-
- id: checkout
227-
name: Checkout repository
228-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
229-
- id: packages_excerpter_pub_upgrade
230-
name: packages/excerpter; dart pub upgrade
231-
run: dart pub upgrade
232-
if: "always() && steps.checkout.conclusion == 'success'"
233-
working-directory: packages/excerpter
234-
- name: packages/excerpter; dart test
235-
run: dart test
236-
if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
237-
working-directory: packages/excerpter
238-
needs:
239-
- job_001
240-
- job_002
241-
- job_003
242-
- job_004
243-
job_006:
244-
name: "unit_test; Dart 3.3.0; PKGS: packages/code_excerpt_updater, packages/code_excerpter; `dart test`"
187+
job_004:
188+
name: "unit_test; Dart 3.3.0; PKGS: packages/code_excerpt_updater, packages/code_excerpter, packages/excerpter; `dart test`"
245189
runs-on: ubuntu-latest
246190
steps:
247191
- name: Cache Pub hosted dependencies
248192
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
249193
with:
250194
path: "~/.pub-cache/hosted"
251-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter;commands:test"
195+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/excerpter;commands:test"
252196
restore-keys: |
253-
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter
197+
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:packages/code_excerpt_updater-packages/code_excerpter-packages/excerpter
254198
os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
255199
os:ubuntu-latest;pub-cache-hosted
256200
os:ubuntu-latest
@@ -279,12 +223,20 @@ jobs:
279223
run: dart test
280224
if: "always() && steps.packages_code_excerpter_pub_upgrade.conclusion == 'success'"
281225
working-directory: packages/code_excerpter
226+
- id: packages_excerpter_pub_upgrade
227+
name: packages/excerpter; dart pub upgrade
228+
run: dart pub upgrade
229+
if: "always() && steps.checkout.conclusion == 'success'"
230+
working-directory: packages/excerpter
231+
- name: packages/excerpter; dart test
232+
run: dart test
233+
if: "always() && steps.packages_excerpter_pub_upgrade.conclusion == 'success'"
234+
working-directory: packages/excerpter
282235
needs:
283236
- job_001
284237
- job_002
285238
- job_003
286-
- job_004
287-
job_007:
239+
job_005:
288240
name: "unit_test; Dart dev; PKGS: packages/code_excerpt_updater, packages/code_excerpter, packages/excerpter; `dart test`"
289241
runs-on: ubuntu-latest
290242
steps:
@@ -336,4 +288,3 @@ jobs:
336288
- job_001
337289
- job_002
338290
- job_003
339-
- job_004

packages/excerpter/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ publish_to: none
55
repository: https://github.com/dart-lang/site-shared/tree/main/packages/excerpter
66

77
environment:
8-
sdk: ^3.2.0
8+
sdk: ^3.3.0
99

1010
dependencies:
1111
args: ^2.4.2
@@ -19,7 +19,7 @@ dev_dependencies:
1919
analysis_defaults:
2020
path: ../analysis_defaults
2121
io: ^1.0.4
22-
test: ^1.24.9
22+
test: ^1.25.2
2323

2424
executables:
2525
excerpter: excerpter

0 commit comments

Comments
 (0)