Skip to content

Commit b04014e

Browse files
committed
Install pigeon globally
1 parent f14f7e3 commit b04014e

File tree

3 files changed

+40
-15
lines changed

3 files changed

+40
-15
lines changed

.circleci/config.yml

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,22 @@ orbs:
66
node: circleci/[email protected]
77

88
commands:
9-
setup_flutter:
9+
setup_pigeon:
1010
steps:
11-
- flutter/install_sdk_and_pub:
12-
flutter_version: 3.3.0
11+
- run:
12+
name: Install Pigeon Globally
13+
command: dart pub global activate pigeon 10.0.0
1314
- run:
1415
name: Generate Pigeons
16+
working_directory: ~/project
1517
command: sh ./scripts/pigeon.sh
18+
19+
setup_flutter:
20+
steps:
21+
- flutter/install_sdk_and_pub:
22+
flutter_version: 3.3.0
23+
- setup_pigeon
24+
1625
setup_ios:
1726
steps:
1827
- setup_flutter
@@ -82,11 +91,25 @@ jobs:
8291
pkg-manager: yarn
8392
override-ci-command: yarn install --frozen-lockfile --network-concurrency 1
8493
- attach_workspace:
85-
at: coverage
94+
at: '.'
8695
- run:
8796
name: Run Danger
8897
command: yarn danger ci
8998

99+
generate_pigeons:
100+
docker:
101+
- image: cirrusci/flutter:stable
102+
steps:
103+
- checkout
104+
- run: flutter pub get
105+
- setup_pigeon
106+
- persist_to_workspace:
107+
root: '.'
108+
paths:
109+
- '*.g.dart'
110+
- android/**/generated/
111+
- ios/**/Generated/
112+
90113
test_flutter:
91114
parameters:
92115
version:
@@ -95,17 +118,18 @@ jobs:
95118
- image: cirrusci/flutter:<<parameters.version>>
96119
steps:
97120
- checkout
121+
- attach_workspace:
122+
at: '.'
98123
- run: flutter pub get
99-
- run: sh ./scripts/pigeon.sh
100124
- run: flutter pub run build_runner build --delete-conflicting-outputs
101125
- run: flutter test --coverage
102126
- run:
103127
working_directory: coverage
104128
command: lcov --remove lcov.info '*.g.dart' '*.mocks.dart' -o lcov.info
105129
- persist_to_workspace:
106-
root: coverage
130+
root: '.'
107131
paths:
108-
- lcov.info
132+
- coverage/lcov.info
109133

110134
test_android:
111135
executor:
@@ -193,7 +217,7 @@ jobs:
193217
steps:
194218
- checkout
195219
- run: flutter pub get
196-
- run: sh ./scripts/pigeon.sh
220+
- setup_pigeon
197221
- run: flutter pub run build_runner build --delete-conflicting-outputs
198222
- run:
199223
name: Perform Static Analysis
@@ -205,7 +229,7 @@ jobs:
205229
steps:
206230
- checkout
207231
- run: flutter pub get
208-
- run: sh ./scripts/pigeon.sh
232+
- setup_pigeon
209233
- run: flutter pub run build_runner build --delete-conflicting-outputs
210234
- run:
211235
name: Check Package Score
@@ -222,10 +246,7 @@ jobs:
222246
- flutter/install_sdk_and_pub:
223247
flutter_version: 3.3.6
224248
app-dir: project
225-
- run:
226-
name: Generate Pigeons
227-
working_directory: project
228-
command: sh ./scripts/pigeon.sh
249+
- setup_pigeon
229250
- run:
230251
name: Clone Escape
231252
command: git clone [email protected]:Instabug/Escape.git
@@ -250,9 +271,14 @@ workflows:
250271
- test_flutter:
251272
name: test_flutter-stable
252273
version: stable
274+
requires:
275+
- generate_pigeons
253276
- test_flutter:
254277
name: test_flutter-2.10.5
255278
version: 2.10.5
279+
requires:
280+
- generate_pigeons
281+
- generate_pigeons
256282
- test_android
257283
- e2e_android_captain
258284
- test_ios

pubspec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ dev_dependencies:
2020
lint: ^1.0.0
2121
mockito: ^5.4.0
2222
pana: ^0.21.0
23-
pigeon: ^9.2.5
2423

2524
flutter:
2625
plugin:

scripts/pigeon.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ generate_pigeon() {
1414
name_snake=$(basename $name_file .api.dart)
1515
name_pascal=$(echo "$name_snake" | perl -pe 's/(^|_)./uc($&)/ge;s/_//g')
1616

17-
flutter pub run pigeon \
17+
dart pub global run pigeon \
1818
--input "pigeons/$name_snake.api.dart" \
1919
--dart_out "$DIR_DART/$name_snake.api.g.dart" \
2020
--objc_header_out "$DIR_IOS/${name_pascal}Pigeon.h" \

0 commit comments

Comments
 (0)