From f2458b17c0bce29d8df0f7939912132a8828f46b Mon Sep 17 00:00:00 2001 From: Greg Price Date: Thu, 19 Dec 2024 14:48:26 -0800 Subject: [PATCH] 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`. --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b0c9cf3d2..6ae781c17d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,10 +27,11 @@ jobs: 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 "upstream/master": - # https://github.com/flutter/flutter/issues/160558 + # 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 - git --git-dir ~/flutter/.git update-ref refs/remotes/upstream/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