Skip to content

Commit df1c960

Browse files
committed
Fix
1 parent 1ca70b7 commit df1c960

1 file changed

Lines changed: 26 additions & 3 deletions

File tree

‎.github/workflows/build-and-upload-engine-artifacts.yml‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9320,15 +9320,38 @@ jobs:
93209320
else
93219321
echo "base=https://engine.flutter0.dev" >> $GITHUB_OUTPUT
93229322
fi
9323+
- name: Set up depot_tools
9324+
run: |
9325+
rm -rf "$HOME/depot_tools"
9326+
for attempt in 1 2 3; do
9327+
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools" && break
9328+
rm -rf "$HOME/depot_tools"
9329+
echo "depot_tools clone failed (attempt $attempt), retrying..."
9330+
sleep 5
9331+
done
9332+
test -d "$HOME/depot_tools/.git"
9333+
# Append depot_tools to the PATH for subsequent steps
9334+
echo "$HOME/depot_tools" >> $GITHUB_PATH
9335+
# TEMP(build-from-scratch): the engine_tool workspace resolves packages
9336+
# via path dependencies inside flutter/third_party/dart, which a plain
9337+
# checkout does not contain. Sync with the slim gclient config (the same
9338+
# flavor the artifact test jobs use) to materialize them before running
9339+
# the stamp.
9340+
- name: Copy gclient file
9341+
run: |
9342+
cp engine/scripts/slim.gclient .gclient
9343+
- name: GClient sync
9344+
run: |
9345+
gclient sync -D --no-history --shallow --with_branch_heads
93239346
- name: Generate engine_stamp.json with the deployed Dart SDK
93249347
env:
93259348
FLUTTER_STORAGE_BASE_URL: ${{ steps.storage.outputs.base }}
93269349
FLUTTER_PREBUILT_ENGINE_VERSION: ${{ steps.engine_content_hash.outputs.value }}
93279350
run: |
93289351
cd engine/src
9329-
# TEMP(build-from-scratch): the engine_tool package is not
9330-
# pre-resolved without gclient sync, so resolve it explicitly with
9331-
# the deployed Dart SDK before invoking the tool.
9352+
# TEMP(build-from-scratch): belt and braces - resolve the remaining
9353+
# packages with the deployed Dart SDK in case the sync hook did not
9354+
# prepare the engine_tool .dart_tool.
93329355
../../bin/dart pub get --directory flutter/tools/engine_tool
93339356
../../bin/dart flutter/tools/engine_tool/bin/et.dart stamp
93349357
- name: Select the R2 target

0 commit comments

Comments
 (0)