Skip to content

Commit cc97e16

Browse files
authored
feat: Allow git ref as version in master channel (#237)
* feat: Allow git ref as version in `master` channel * fix lint * fix parsing * fix test * fix checkout, add tests * replace with tab
1 parent ed388ba commit cc97e16

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

.github/workflows/workflow.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,13 @@ jobs:
107107
shell: bash
108108
- run: ./setup.sh -t -p dev | grep 'flutter-macos-dev-2.11.0-0.1.pre-x64-b101bfe32f634566e7cb2791a9efe19cf8828b15'
109109
shell: bash
110-
- run: ./setup.sh -t -p master | grep 'flutter-macos-master-master-x64-master'
110+
- run: ./setup.sh -t -p master | grep 'flutter-macos-master-any-x64-master'
111+
shell: bash
112+
- run: ./setup.sh -t -p -n 5b12b74 master | grep 'flutter-macos-master-5b12b74-x64-master'
113+
shell: bash
114+
- run: ./setup.sh -t -p -n 3.12.0-12.0.pre master | grep 'flutter-macos-master-3.12.0-12.0.pre-x64-master'
115+
shell: bash
116+
- run: ./setup.sh -t -p -n stable master | grep 'flutter-macos-master-stable-x64-master'
111117
shell: bash
112118
- run: ./setup.sh -t -p -n 2 any | grep 'flutter-macos-beta-2.13.0-0.4.pre-x64-25caf1461b8f643092a9f6f5b224453b5c057d10'
113119
shell: bash
@@ -123,7 +129,7 @@ jobs:
123129
shell: bash
124130
- run: ./setup.sh -t -p dev | grep '/Users/runner/work/_temp/flutter/dev-2.11.0-0.1.pre-x64'
125131
shell: bash
126-
- run: ./setup.sh -t -p master | grep '/Users/runner/work/_temp/flutter/master-master-x64'
132+
- run: ./setup.sh -t -p master | grep '/Users/runner/work/_temp/flutter/master-any-x64'
127133
shell: bash
128134
- run: ./setup.sh -t -p -k 'custom-:channel:-:version:-:hash:' | grep 'custom-stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da'
129135
shell: bash

README.md

+12
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,18 @@ steps:
5151
- run: flutter --version
5252
```
5353
54+
Use particular git reference on master channel:
55+
56+
```yaml
57+
steps:
58+
- uses: actions/checkout@v3
59+
- uses: subosito/flutter-action@v2
60+
with:
61+
flutter-version: '5b12b74' # tag, commit or branch
62+
channel: 'master'
63+
- run: flutter --version
64+
```
65+
5466
Build Android APK and app bundle:
5567
5668
```yaml

setup.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ else
9797
fi
9898

9999
if [[ "$CHANNEL" == "master" ]]; then
100-
VERSION_MANIFEST="{\"channel\":\"$CHANNEL\",\"version\":\"$CHANNEL\",\"dart_sdk_arch\":\"$ARCH\",\"hash\":\"$CHANNEL\",\"sha256\":\"$CHANNEL\"}"
100+
VERSION_MANIFEST="{\"channel\":\"$CHANNEL\",\"version\":\"$VERSION\",\"dart_sdk_arch\":\"$ARCH\",\"hash\":\"$CHANNEL\",\"sha256\":\"$CHANNEL\"}"
101101
else
102102
VERSION_MANIFEST=$(echo "$RELEASE_MANIFEST" | filter_by_channel "$CHANNEL" | filter_by_arch "$ARCH" | filter_by_version "$VERSION")
103103
fi
@@ -157,6 +157,10 @@ fi
157157
if [[ ! -x "$CACHE_PATH/bin/flutter" ]]; then
158158
if [[ "$CHANNEL" == "master" ]]; then
159159
git clone -b master https://github.com/flutter/flutter.git "$CACHE_PATH"
160+
if [[ "$VERSION" != "any" ]]; then
161+
git config --global --add safe.directory "$CACHE_PATH"
162+
(cd "$CACHE_PATH" && git checkout "$VERSION")
163+
fi
160164
else
161165
archive_url=$(echo "$VERSION_MANIFEST" | jq -r '.archive')
162166
download_archive "$archive_url" "$CACHE_PATH"

0 commit comments

Comments
 (0)