From d6affc9dbbb492d20af9e8721319ac57bf2238d7 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Thu, 17 Jul 2025 15:49:11 -0700 Subject: [PATCH 1/2] ci: Fetch 3000 commits from upstream, rather than 1000 Fixes #1710. This should work around the problem for a few more months. If it doesn't get fixed upstream by then, we can figure something else out. --- .github/workflows/ci.yml | 6 +++++- .github/workflows/update-translations.yml | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7820b3e2de..89d71fb8ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,13 +22,17 @@ 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 master 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" diff --git a/.github/workflows/update-translations.yml b/.github/workflows/update-translations.yml index fb676042ff..7703fd6ec1 100644 --- a/.github/workflows/update-translations.yml +++ b/.github/workflows/update-translations.yml @@ -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" From a3bbee9f037e5f8c6d10514b8a296236270f93c2 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Thu, 17 Jul 2025 15:46:02 -0700 Subject: [PATCH 2/2] ci: Revert temp hack for desync of Flutter main branch This reverts commits 9cc34cd7e and 37af86db6 (#1691, #1690). The operational issue in the upstream repo which this worked around has been fixed. --- .github/workflows/ci.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89d71fb8ec..4ff2bfbe7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,12 +27,7 @@ jobs: # 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=3000 -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" @@ -40,7 +35,7 @@ jobs: # (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 @@ -49,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