Skip to content

Commit f2458b1

Browse files
committed
ci: Update workaround for broken ref for Flutter upstream main
Fixes #1177, take 2. The original hacky workaround subsequently broke after the upstream change that fixed the "upstream" vs. "origin" part of the issue. We still need a version of this workaround, though, because we clone the repo with the branch `main`, which in the Flutter repo always points to the same commit as `master`.
1 parent bf64923 commit f2458b1

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/workflows/ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ jobs:
2727
TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local
2828
echo ~/flutter/bin >> "$GITHUB_PATH"
2929
30-
# The Flutter tool assumes the tip of tree is "upstream/master":
31-
# https://github.com/flutter/flutter/issues/160558
30+
# The Flutter tool assumes the tip of tree is "origin/master"
31+
# (or "upstream/master"):
32+
# https://github.com/flutter/flutter/issues/160626
3233
# TODO(upstream): make workaround unneeded
33-
git --git-dir ~/flutter/.git update-ref refs/remotes/upstream/master origin/main
34+
git --git-dir ~/flutter/.git update-ref refs/remotes/origin/master origin/main
3435
3536
- name: Download Flutter SDK artifacts (flutter precache)
3637
run: flutter precache --universal

0 commit comments

Comments
 (0)