Skip to content

Commit a3bbee9

Browse files
committed
ci: Revert temp hack for desync of Flutter main branch
This reverts commits 9cc34cd and 37af86d (#1691, #1690). The operational issue in the upstream repo which this worked around has been fixed.
1 parent d6affc9 commit a3bbee9

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,15 @@ jobs:
2727
# https://github.com/zulip/zulip-flutter/issues/1710
2828
# Pending that, fetch more than 1000 commits.
2929
run: |
30-
# TODO temp hack 2025-07-08 as Flutter's `main` is broken but `master` works:
31-
# https://github.com/zulip/zulip-flutter/pull/1688#issuecomment-3050661097
32-
# https://discord.com/channels/608014603317936148/608021351567065092/1392301750383415376
33-
# https://github.com/flutter/flutter/issues/171833
34-
# (See also "temp hack" items below.)
35-
git clone --depth=3000 -b master https://github.com/flutter/flutter ~/flutter
30+
git clone --depth=3000 -b main https://github.com/flutter/flutter ~/flutter
3631
TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local
3732
echo ~/flutter/bin >> "$GITHUB_PATH"
3833
3934
# The Flutter tool assumes the tip of tree is "origin/master"
4035
# (or "upstream/master"):
4136
# https://github.com/flutter/flutter/issues/160626
4237
# TODO(upstream): make workaround unneeded
43-
# TODO, see temp hack above: git --git-dir ~/flutter/.git update-ref refs/remotes/origin/master origin/main
38+
git --git-dir ~/flutter/.git update-ref refs/remotes/origin/master origin/main
4439
4540
- name: Download Flutter SDK artifacts (flutter precache)
4641
run: flutter precache --universal
@@ -49,5 +44,4 @@ jobs:
4944
run: flutter pub get
5045

5146
- name: Run tools/check
52-
# TODO omitting flutter_version, see temp hack above
53-
run: TERM=dumb tools/check --verbose --all-files analyze test build_runner l10n drift pigeon icons android shellcheck
47+
run: TERM=dumb tools/check --all --verbose

0 commit comments

Comments
 (0)