Skip to content

Commit acdf1fa

Browse files
adil192adil192
committed
ci: use my setup-flutter-submodule action
1 parent aee47a1 commit acdf1fa

File tree

10 files changed

+50
-56
lines changed

10 files changed

+50
-56
lines changed

‎.github/workflows/android-play-store.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ jobs:
2121
path: |
2222
.dart_tool/
2323
build/
24-
.flutter-plugins
24+
linux/flutter/ephemeral/
25+
macos/Flutter/ephemeral/
26+
windows/flutter/ephemeral/
2527
.flutter-plugins-dependencies
2628
pubspec.lock
2729
key: ${{ runner.OS }}-ricochlime-ubuntu-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
@@ -40,11 +42,9 @@ jobs:
4042
echo "storeFile=../android.keystore" >> android/key.properties
4143
4244
- name: Setup Flutter
43-
uses: subosito/flutter-action@v2
45+
uses: adil192/setup-flutter-submodule@v1
4446
with:
45-
channel: stable
46-
cache: true
47-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
47+
flutter-path: submodules/flutter
4848

4949
- name: Setup Java
5050
uses: actions/setup-java@v5

‎.github/workflows/android.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ jobs:
2020
path: |
2121
.dart_tool/
2222
build/
23-
.flutter-plugins
23+
linux/flutter/ephemeral/
24+
macos/Flutter/ephemeral/
25+
windows/flutter/ephemeral/
2426
.flutter-plugins-dependencies
2527
pubspec.lock
2628
key: ${{ runner.OS }}-ricochlime-ubuntu-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
@@ -38,12 +40,10 @@ jobs:
3840
echo "keyAlias=${{ secrets.ALIAS }}" >> android/key.properties
3941
echo "storeFile=../android.keystore" >> android/key.properties
4042
41-
- name: Install Flutter
42-
uses: subosito/flutter-action@v2
43+
- name: Setup Flutter
44+
uses: adil192/setup-flutter-submodule@v1
4345
with:
44-
channel: stable
45-
cache: true
46-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
46+
flutter-path: submodules/flutter
4747

4848
- name: Setup Java
4949
uses: actions/setup-java@v5
@@ -101,12 +101,10 @@ jobs:
101101
echo "keyAlias=${{ secrets.ALIAS }}" >> android/key.properties
102102
echo "storeFile=../android.keystore" >> android/key.properties
103103
104-
- name: Install Flutter
105-
uses: subosito/flutter-action@v2
104+
- name: Setup Flutter
105+
uses: adil192/setup-flutter-submodule@v1
106106
with:
107-
channel: stable
108-
cache: true
109-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
107+
flutter-path: submodules/flutter
110108

111109
- name: Setup Java
112110
uses: actions/setup-java@v5

‎.github/workflows/ios.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,10 @@ jobs:
6464
- name: Remove dev dependencies
6565
run: ./patches/remove_dev_dependencies.sh
6666

67-
- name: Install Flutter
68-
uses: subosito/flutter-action@v2
67+
- name: Setup Flutter
68+
uses: adil192/setup-flutter-submodule@v1
6969
with:
70-
channel: stable
71-
architecture: x64
72-
cache: true
73-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
70+
flutter-path: submodules/flutter
7471

7572
- name: Install Codemagic CLI Tools
7673
run: pipx install codemagic-cli-tools

‎.github/workflows/linux.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ jobs:
5151
path: |
5252
.dart_tool/
5353
build/
54-
.flutter-plugins
54+
linux/flutter/ephemeral/
55+
macos/Flutter/ephemeral/
56+
windows/flutter/ephemeral/
5557
.flutter-plugins-dependencies
5658
pubspec.lock
5759
key: ${{ runner.OS }}-ricochlime-ubuntu-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
@@ -62,11 +64,9 @@ jobs:
6264
run: ./patches/remove_dev_dependencies.sh
6365

6466
- name: Setup Flutter
65-
uses: subosito/flutter-action@v2
67+
uses: adil192/setup-flutter-submodule@v1
6668
with:
67-
channel: stable
68-
cache: true
69-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
69+
flutter-path: submodules/flutter
7070

7171
- run: flutter pub get
7272

@@ -125,7 +125,9 @@ jobs:
125125
path: |
126126
.dart_tool/
127127
build/
128-
.flutter-plugins
128+
linux/flutter/ephemeral/
129+
macos/Flutter/ephemeral/
130+
windows/flutter/ephemeral/
129131
.flutter-plugins-dependencies
130132
pubspec.lock
131133
key: ${{ runner.OS }}-ricochlime-armlinux-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}

‎.github/workflows/macos.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,10 @@ jobs:
4848
- name: Remove dev dependencies
4949
run: ./patches/remove_dev_dependencies.sh
5050

51-
- name: Install Flutter
52-
uses: subosito/flutter-action@v2
51+
- name: Setup Flutter
52+
uses: adil192/setup-flutter-submodule@v1
5353
with:
54-
channel: stable
55-
architecture: x64
56-
cache: true
57-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
54+
flutter-path: submodules/flutter
5855

5956
- name: Install Codemagic CLI Tools
6057
run: pipx install codemagic-cli-tools

‎.github/workflows/test.yaml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ jobs:
2525
path: |
2626
.dart_tool/
2727
build/
28-
.flutter-plugins
28+
linux/flutter/ephemeral/
29+
macos/Flutter/ephemeral/
30+
windows/flutter/ephemeral/
2931
.flutter-plugins-dependencies
3032
pubspec.lock
3133
key: ${{ runner.OS }}-ricochlime-ubuntu-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
@@ -39,7 +41,9 @@ jobs:
3941
path: |
4042
.dart_tool/
4143
build/
42-
.flutter-plugins
44+
linux/flutter/ephemeral/
45+
macos/Flutter/ephemeral/
46+
windows/flutter/ephemeral/
4347
.flutter-plugins-dependencies
4448
pubspec.lock
4549
key: ${{ runner.OS }}-ricochlime-ubuntu-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
@@ -51,12 +55,10 @@ jobs:
5155
run: |
5256
./patches/foss.sh
5357
54-
- name: Install Flutter
55-
uses: subosito/flutter-action@v2
58+
- name: Setup Flutter
59+
uses: adil192/setup-flutter-submodule@v1
5660
with:
57-
channel: stable
58-
cache: true
59-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
61+
flutter-path: submodules/flutter
6062

6163
- run: flutter pub get
6264

‎.github/workflows/web.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ jobs:
2626
path: |
2727
.dart_tool/
2828
build/
29-
.flutter-plugins
29+
linux/flutter/ephemeral/
30+
macos/Flutter/ephemeral/
31+
windows/flutter/ephemeral/
3032
.flutter-plugins-dependencies
3133
pubspec.lock
3234
key: ${{ runner.OS }}-ricochlime-ubuntu-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
@@ -39,12 +41,10 @@ jobs:
3941
- name: Remove dev dependencies
4042
run: ./patches/remove_dev_dependencies.sh
4143

42-
- name: Install Flutter
43-
uses: subosito/flutter-action@v2
44+
- name: Setup Flutter
45+
uses: adil192/setup-flutter-submodule@v1
4446
with:
45-
channel: stable
46-
cache: true
47-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
47+
flutter-path: submodules/flutter
4848

4949
- name: Build web
5050
run: flutter build web --release

‎.github/workflows/windows.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ jobs:
4343
path: |
4444
.dart_tool/
4545
build/
46-
.flutter-plugins
46+
linux/flutter/ephemeral/
47+
macos/Flutter/ephemeral/
48+
windows/flutter/ephemeral/
4749
.flutter-plugins-dependencies
4850
pubspec.lock
4951
key: ${{ runner.OS }}-ricochlime-windows-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
@@ -55,11 +57,9 @@ jobs:
5557
run: ./patches/remove_dev_dependencies.sh
5658

5759
- name: Setup Flutter
58-
uses: subosito/flutter-action@v2
60+
uses: adil192/setup-flutter-submodule@v1
5961
with:
60-
channel: stable
61-
cache: true
62-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
62+
flutter-path: submodules/flutter
6363

6464
- run: flutter pub get
6565

‎.gitmodules‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[submodule "flutter"]
22
path = submodules/flutter
33
url = https://github.com/flutter/flutter
4+
branch = stable

‎scripts/update_flutter_submodule.sh‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
#!/usr/bin/env bash
22

3-
pushd submodules/flutter
4-
git fetch
5-
git reset --hard origin/stable
6-
popd
3+
git submodule update -f --remote submodules/flutter

0 commit comments

Comments
 (0)