Skip to content

ci: Fetch 3000 commits from upstream, rather than 1000 #1711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 18, 2025
Merged

ci: Fetch 3000 commits from upstream, rather than 1000 #1711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6affc9
ci: Fetch 3000 commits from upstream, rather than 1000
gnprice Jul 17, 2025
a3bbee9
ci: Revert temp hack for desync of Flutter main branch
gnprice Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,20 @@ jobs:
# so that Flutter knows its version and sees the constraint in our
# pubspec is satisfied. It's uncommon for flutter/flutter to go
# more than 100 commits between tags. Fetch 1000 for good measure.
# TODO(upstream): Around 2025-05, Flutter upstream stopped making
# tags within the main/master branch. Get that fixed:
# https://github.com/zulip/zulip-flutter/issues/1710
# Pending that, fetch more than 1000 commits.
run: |
# TODO temp hack 2025-07-08 as Flutter's `main` is broken but `master` works:
# https://github.com/zulip/zulip-flutter/pull/1688#issuecomment-3050661097
# https://discord.com/channels/608014603317936148/608021351567065092/1392301750383415376
# https://github.com/flutter/flutter/issues/171833
# (See also "temp hack" items below.)
git clone --depth=1000 -b master https://github.com/flutter/flutter ~/flutter
git clone --depth=3000 -b main https://github.com/flutter/flutter ~/flutter
TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local
echo ~/flutter/bin >> "$GITHUB_PATH"

# The Flutter tool assumes the tip of tree is "origin/master"
# (or "upstream/master"):
# https://github.com/flutter/flutter/issues/160626
# TODO(upstream): make workaround unneeded
# TODO, see temp hack above: git --git-dir ~/flutter/.git update-ref refs/remotes/origin/master origin/main
git --git-dir ~/flutter/.git update-ref refs/remotes/origin/master origin/main

- name: Download Flutter SDK artifacts (flutter precache)
run: flutter precache --universal
Expand All @@ -45,5 +44,4 @@ jobs:
run: flutter pub get

- name: Run tools/check
# TODO omitting flutter_version, see temp hack above
run: TERM=dumb tools/check --verbose --all-files analyze test build_runner l10n drift pigeon icons android shellcheck
run: TERM=dumb tools/check --all --verbose
3 changes: 2 additions & 1 deletion .github/workflows/update-translations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ jobs:
# so that Flutter knows its version and sees the constraint in our
# pubspec is satisfied. It's uncommon for flutter/flutter to go
# more than 100 commits between tags. Fetch 1000 for good measure.
# TODO(upstream): See ci.yml for why we fetch more than 1000.
run: |
git clone --depth=1000 -b main https://github.com/flutter/flutter ~/flutter
git clone --depth=3000 -b main https://github.com/flutter/flutter ~/flutter
TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local
echo ~/flutter/bin >> "$GITHUB_PATH"

Expand Down
Loading