dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[tool] Delete unsupported patches system

Browse Source 
The old patches system in tools/patches is not supported in the 3H
infra.

Currently, Golem still uses the DEPS updating logic. This should be
deleted when Golem also moves over to the 3H infra.

Change-Id: Id42d8499a0fa42d18061908e9d1a18b687582ba7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/349640
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
This commit is contained in:
Daco Harkes
2024-02-01 12:02:08 +00:00
committed by Commit Queue
parent 2b396dd95a
commit fe39068928
5 changed files with 3 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/3xhead_flutter_hooks.sh
+2 -4
View File
@@ -18,8 +18,6 @@ DIR=$(dirname -- "$(which -- "$0")")
ensure_in_checkout_root
# Apply patches to the Flutter Framework if needed.
src/third_party/dart/tools/patches/flutter-flutter/apply.sh
# Apply patches to the Flutter Engine if needed.
# Copy changed dependencies from Dart DEPS to engine DEPS and update them in
# checkout.
src/third_party/dart/tools/patches/flutter-engine/apply.sh
tools/patches/flutter-engine/apply.sh
+1 -23
View File
@@ -4,18 +4,7 @@
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
#
# When in a Flutter Engine checkout, this script checks what version of the Dart
# SDK the engine is pinned to, and patches the engine if there is a known patch
# that needs to be applied on the next Dart SDK roll in the engine.
#
# This script is meant to be used by 3xHEAD CI infrastructure, allowing
# incompatible changes to be made to the Dart SDK requiring a matching change
# to the Flutter Engine, without breaking the CI. The patch is associated with
# the Dart SDK version the engine is pinned so. When the engine rolls its SDK,
# then it stops applying patches atomically as there isn't a patch available yet
# for the new roll.
#
# Additionally, this script updates the flutter engine DEPS file with the
# This script updates the flutter engine DEPS file with the
# Dart SDK dependencies.
#
# Usage: src/third_party/dart/tools/patches/flutter-engine/apply.sh
@@ -30,17 +19,6 @@ ensure_in_checkout_root
pinned_dart_sdk=$(get_pinned_dart_version)
need_runhooks=false
patch=src/third_party/dart/tools/patches/flutter-engine/${pinned_dart_sdk}.flutter.patch
if [ -e "$patch" ]; then
(cd flutter && git apply ../$patch)
need_runhooks=true
fi
patch=src/third_party/dart/tools/patches/flutter-engine/${pinned_dart_sdk}.patch
if [ -e "$patch" ]; then
(cd src/flutter && git apply ../../$patch)
need_runhooks=true
fi
# Update the flutter DEPS with the revisions in the Dart SDK DEPS.
src/tools/dart/create_updated_flutter_deps.py
tools/patches/flutter-engine/create.sh
-30
View File
@@ -1,30 +0,0 @@
#!/usr/bin/env bash
#
# Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
#
# This script produces a patch to the Flutter Engine from the local uncommitted
# changes in the current engine checkout. It is named after the Dart SDK
# revision the engine is currently pinned to. It's meant to be consumed by the
# apply.sh script next to this script. Any existing patches are removed, as they
# are assumed to not be relevant anymore. If there are no uncommitted changes in
# the local engine checkout, then no patch is produced.
#
# Usage: src/third_party/dart/tools/patches/flutter-engine/create.sh
# (run inside the root of a flutter engine checkout)
set -e
DIR=$(dirname -- "$(which -- "$0")")
. $DIR/../utils.sh
ensure_in_checkout_root
pinned_dart_sdk=$(get_pinned_dart_version)
patch=src/third_party/dart/tools/patches/flutter-engine/$pinned_dart_sdk.patch
rm -f src/third_party/dart/tools/patches/flutter-engine/*.patch
(cd src/flutter && git diff) > $patch
if [ ! -s $patch ]; then
rm $patch
fi
tools/patches/flutter-flutter/apply.sh
-31
View File
@@ -1,31 +0,0 @@
#!/usr/bin/env bash
#
# Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
#
# This script applies a patch, if available, to the Flutter Framework. Only a
# patch is applied for the particular engine.version the flutter framework is
# using.
#
# Usage: src/third_party/dart/tools/patches/flutter-flutter/apply.sh
# (run inside the root of a flutter checkout)
set -e
DIR=$(dirname -- "$(which -- "$0")")
. $DIR/../utils.sh
ensure_in_checkout_root
pinned_engine_version=$(get_pinned_flutter_engine_version)
patch=src/third_party/dart/tools/patches/flutter-flutter/${pinned_engine_version}.patch
if [ -e "$patch" ]; then
(cd flutter && git apply ../$patch)
fi
pinned_dart_sdk=$(get_pinned_dart_version)
patch=src/third_party/dart/tools/patches/flutter-flutter/${pinned_dart_sdk}.patch
if [ -e "$patch" ]; then
(cd flutter && git apply ../$patch)
fi
tools/patches/flutter-flutter/create.sh
-26
View File
@@ -1,26 +0,0 @@
#!/usr/bin/env bash
#
# Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
#
# This script produces a patch to the Flutter Framework from the local
# uncommitted changes in the current engine checkout.
#
# Usage: src/third_party/dart/tools/patches/flutter-flutter/create.sh
# (run inside the root of a flutter engine checkout)
set -e
DIR=$(dirname -- "$(which -- "$0")")
. $DIR/../utils.sh
ensure_in_checkout_root
pinned_engine_version=$(get_pinned_flutter_engine_version)
patch=src/third_party/dart/tools/patches/flutter-flutter/$pinned_engine_version.patch
rm -f src/third_party/dart/tools/patches/flutter-flutter/*.patch
(cd flutter && git diff) > $patch
if [ ! -s $patch ]; then
rm $patch
fi