Skip to content

Commit 24a1997

Browse files
ci: enforce flutter sdk tooling across all package verification checks
1 parent 4d0763c commit 24a1997

4 files changed

Lines changed: 6 additions & 66 deletions

File tree

.github/actions/setup-dart/action.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/ci.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ on:
77
- "test/**"
88
- "pubspec.yaml"
99
- "example/**"
10-
- ".github/workflows/ci.yaml"
11-
- ".github/workflows/reusable_verify.yaml"
10+
- ".github/workflows/**"
1211
pull_request:
1312
paths:
1413
- "lib/**"
1514
- "test/**"
1615
- "pubspec.yaml"
1716
- "example/**"
18-
- ".github/workflows/ci.yaml"
19-
- ".github/workflows/reusable_verify.yaml"
17+
- ".github/workflows/**"
2018
workflow_dispatch:
2119

2220
concurrency:
@@ -53,7 +51,6 @@ jobs:
5351
uses: ./.github/workflows/reusable_verify.yaml
5452
with:
5553
working-directory: .
56-
sdk: dart
5754
secrets: inherit
5855

5956
verify_example:
@@ -62,5 +59,4 @@ jobs:
6259
uses: ./.github/workflows/reusable_verify.yaml
6360
with:
6461
working-directory: example
65-
sdk: flutter
6662
secrets: inherit

.github/workflows/deploy.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [main, fix-ci-failing]
66
tags:
7-
- "*"
7+
- "v[0-9]+.[0-9]+.[0-9]+"
88

99
concurrency:
1010
group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,7 +15,6 @@ jobs:
1515
uses: ./.github/workflows/reusable_verify.yaml
1616
with:
1717
working-directory: example
18-
sdk: flutter
1918
run-tests: true
2019
secrets: inherit
2120

.github/workflows/reusable_verify.yaml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ on:
88
required: false
99
default: "."
1010
type: string
11-
sdk:
12-
description: 'Which SDK to use: "dart" or "flutter"'
13-
required: false
14-
default: "dart"
15-
type: string
11+
1612
run-tests:
1713
description: "Whether to run tests"
1814
required: false
@@ -40,14 +36,7 @@ jobs:
4036
- name: Checkout repository
4137
uses: actions/checkout@v4
4238

43-
- name: Setup Dart Environment
44-
if: ${{ inputs.sdk == 'dart' }}
45-
uses: ./.github/actions/setup-dart
46-
with:
47-
working-directory: ${{ inputs.working-directory }}
48-
4939
- name: Setup Flutter Environment
50-
if: ${{ inputs.sdk == 'flutter' }}
5140
uses: ./.github/actions/setup-flutter
5241
with:
5342
flutter-version: ${{ secrets.FLUTTER_VERSION }}
@@ -67,21 +56,14 @@ jobs:
6756
- name: Checkout repository
6857
uses: actions/checkout@v4
6958

70-
- name: Setup Dart Environment
71-
if: ${{ inputs.sdk == 'dart' }}
72-
uses: ./.github/actions/setup-dart
73-
with:
74-
working-directory: ${{ inputs.working-directory }}
75-
7659
- name: Setup Flutter Environment
77-
if: ${{ inputs.sdk == 'flutter' }}
7860
uses: ./.github/actions/setup-flutter
7961
with:
8062
flutter-version: ${{ secrets.FLUTTER_VERSION }}
8163
working-directory: ${{ inputs.working-directory }}
8264

8365
- name: Analyze code
84-
run: ${{ inputs.sdk == 'flutter' && 'flutter' || 'dart' }} analyze --fatal-infos .
66+
run: flutter analyze --fatal-infos .
8567
working-directory: ${{ inputs.working-directory }}
8668

8769
test:
@@ -94,19 +76,12 @@ jobs:
9476
- name: Checkout repository
9577
uses: actions/checkout@v4
9678

97-
- name: Setup Dart Environment
98-
if: ${{ inputs.sdk == 'dart' }}
99-
uses: ./.github/actions/setup-dart
100-
with:
101-
working-directory: ${{ inputs.working-directory }}
102-
10379
- name: Setup Flutter Environment
104-
if: ${{ inputs.sdk == 'flutter' }}
10580
uses: ./.github/actions/setup-flutter
10681
with:
10782
flutter-version: ${{ secrets.FLUTTER_VERSION }}
10883
working-directory: ${{ inputs.working-directory }}
10984

11085
- name: Run tests
111-
run: ${{ inputs.sdk == 'flutter' && 'flutter' || 'dart' }} test
86+
run: flutter test
11287
working-directory: ${{ inputs.working-directory }}

0 commit comments

Comments
 (0)