mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
Rebase ios-experimental branch onto main. This will make the PRs experimenting with newer versions of Xcode (like https://github.com/flutter/flutter/pull/173123) smaller and easier to reason about. Rebases #168860 and #170274 ``` $ git rebase main -Xtheirs ``` --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: gaaclarke <30870216+gaaclarke@users.noreply.github.com> Co-authored-by: Siva <a-siva@users.noreply.github.com> Co-authored-by: engine-flutter-autoroll <engine-flutter-autoroll@skia.org> Co-authored-by: Jamil Saadeh <jssaadeh@outlook.com> Co-authored-by: Dara Adedeji <76637177+SunkenInTime@users.noreply.github.com> Co-authored-by: Greg Price <gnprice@gmail.com> Co-authored-by: Ben Konyi <bkonyi@google.com> Co-authored-by: Ricardo Dalarme <ricardodalarme@outlook.com> Co-authored-by: Flutter GitHub Bot <fluttergithubbot@gmail.com> Co-authored-by: Justin McCandless <jmccandless@google.com> Co-authored-by: Alex Talebi <31685655+SalehTZ@users.noreply.github.com> Co-authored-by: Qun Cheng <36861262+QuncCccccc@users.noreply.github.com> Co-authored-by: Mouad Debbar <mdebbar@google.com> Co-authored-by: Zuckjet <1083941774@qq.com> Co-authored-by: Loïc Sharma <737941+loic-sharma@users.noreply.github.com> Co-authored-by: auto-submit[bot] <98614782+auto-submit[bot]@users.noreply.github.com> Co-authored-by: auto-submit[bot] <flutter-engprod-team@google.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: yim <ybz975218925@gmail.com> Co-authored-by: bufffun <chenmingding.cmd@alibaba-inc.com> Co-authored-by: Chinmay Garde <chinmaygarde@google.com> Co-authored-by: Hannah Jin <jhy03261997@gmail.com> Co-authored-by: Kate Lovett <katelovett@google.com> Co-authored-by: Valentin Vignal <32538273+ValentinVignal@users.noreply.github.com> Co-authored-by: Derek Xu <derekx@google.com> Co-authored-by: Yash Dhrangdhariya <72062416+Yash-Dhrangdhariya@users.noreply.github.com> Co-authored-by: bungeman <bungeman@chromium.org> Co-authored-by: Ahmed Mohamed Sameh <ahmedsameha1@gmail.com> Co-authored-by: John "codefu" McDole <codefu@google.com> Co-authored-by: Dmitry Grand <dmgr@google.com> Co-authored-by: Kostia Sokolovskyi <sokolovskyi.konstantin@gmail.com> Co-authored-by: Reid Baker <1063596+reidbaker@users.noreply.github.com> Co-authored-by: Matthew Kosarek <matt.kosarek@canonical.com> Co-authored-by: Jason Simmons <jason-simmons@users.noreply.github.com> Co-authored-by: Jim Graham <flar@google.com> Co-authored-by: Michael Goderbauer <goderbauer@google.com> Co-authored-by: Gray Mackall <34871572+gmackall@users.noreply.github.com> Co-authored-by: Gray Mackall <mackall@google.com> Co-authored-by: Tong Mu <dkwingsmt@users.noreply.github.com> Co-authored-by: Jon Ihlas <jon.i@hotmail.fr> Co-authored-by: Micael Cid <micaelcid10@gmail.com> Co-authored-by: Alexander Aprelev <aam@google.com> Co-authored-by: hellohuanlin <41930132+hellohuanlin@users.noreply.github.com> Co-authored-by: Luke Memet <1598289+lukemmtt@users.noreply.github.com> Co-authored-by: Victoria Ashworth <15619084+vashworth@users.noreply.github.com> Co-authored-by: Mairramer <50643541+Mairramer@users.noreply.github.com> Co-authored-by: Florin Malita <fmalita@gmail.com> Co-authored-by: chunhtai <47866232+chunhtai@users.noreply.github.com> Co-authored-by: Salem Iranloye <127918074+salemiranloye@users.noreply.github.com> Co-authored-by: Kevin Moore <kevmoo@google.com> Co-authored-by: Sydney Bao <sydneybao@google.com> Co-authored-by: Wdestroier <Wdestroier@gmail.com> Co-authored-by: Matt Boetger <matt.boetger@gmail.com> Co-authored-by: Reid Baker <reidbaker@google.com> Co-authored-by: Victor Sanni <victorsanniay@gmail.com> Co-authored-by: Jessy Yameogo <jessy.yameogo@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: romain.gyh <11901536+romaingyh@users.noreply.github.com> Co-authored-by: Robert Ancell <robert.ancell@canonical.com> Co-authored-by: TheLastFlame <131446187+TheLastFlame@users.noreply.github.com> Co-authored-by: masato <returnymgstokh@icloud.com> Co-authored-by: Albin PK <56157868+albinpk@users.noreply.github.com> Co-authored-by: Huy <huy@nevercode.io> Co-authored-by: Matan Lurey <matanlurey@users.noreply.github.com> Co-authored-by: Azat Chorekliyev <azat24680@gmail.com> Co-authored-by: EdwynZN <edwinzn9@gmail.com> Co-authored-by: Bruno Leroux <bruno.leroux@gmail.com> Co-authored-by: Dev TtangKong <ttankkeo112@gmail.com> Co-authored-by: LongCatIsLooong <31859944+LongCatIsLooong@users.noreply.github.com> Co-authored-by: Houssem Eddine Fadhli <houssemeddinefadhli81@gmail.com>
92 lines
2.9 KiB
Dart
92 lines
2.9 KiB
Dart
// Copyright 2014 The Flutter Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'dart:io' as io;
|
|
|
|
import 'package:file/file.dart';
|
|
import 'package:file/local.dart';
|
|
import 'package:meta/meta.dart';
|
|
import 'package:process_runner/process_runner.dart';
|
|
|
|
/// Checks if the contents of [versionPath] are the same as the output of [scriptPath].
|
|
///
|
|
/// ```dart
|
|
/// final bool success = await checkEngineVersion(
|
|
/// versionPath: 'bin/internal/engine.version',
|
|
/// scriptPath: 'bin/internal/last_engine_commit.sh',
|
|
/// );
|
|
/// ```
|
|
///
|
|
/// If the file described at [versionPath] does not exist, this check returns `true`.
|
|
///
|
|
/// If [onlyIfVersionChanged] is `true` (default), and the file described by [versionPath]
|
|
/// has not changed at the current commit SHA compared to HEAD, `true` is immediately
|
|
/// returned without any additional checks.
|
|
@useResult
|
|
Future<bool> checkEngineVersion({
|
|
required String versionPath,
|
|
required String scriptPath,
|
|
bool onlyIfVersionChanged = true,
|
|
@visibleForTesting FileSystem? fileSystem,
|
|
@visibleForTesting ProcessRunner? runner,
|
|
@visibleForTesting StringSink? stderr,
|
|
}) async {
|
|
fileSystem ??= const LocalFileSystem();
|
|
runner ??= ProcessRunner();
|
|
stderr ??= io.stderr;
|
|
|
|
// If the file does not exist, immediately return true.
|
|
final File versionFile = fileSystem.file(versionPath);
|
|
if (!versionFile.existsSync()) {
|
|
stderr.writeln('$versionPath does not exist, skipping engine.version check');
|
|
return true;
|
|
}
|
|
|
|
// The file exists. Do we need to verify it was updated?
|
|
if (onlyIfVersionChanged && !await _wasUpdated(versionPath, runner, stderr)) {
|
|
stderr.writeln('$versionPath has not changed, skipping engine.version check');
|
|
return true;
|
|
}
|
|
|
|
// Get the expected value.
|
|
final ProcessRunnerResult expectedShaResult = await runner.runProcess(<String>[
|
|
scriptPath,
|
|
], failOk: true);
|
|
if (expectedShaResult.exitCode != 0) {
|
|
stderr.writeln('$scriptPath failed: ${expectedShaResult.stdout}');
|
|
return false;
|
|
}
|
|
final String expectedSha = expectedShaResult.stdout.trim();
|
|
|
|
// Get the actual value.
|
|
final String actualSha = versionFile.readAsStringSync().trim();
|
|
|
|
// Compare
|
|
if (expectedSha != actualSha) {
|
|
stderr.writeln('$scriptPath output $expectedSha, but $versionPath is $actualSha');
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
Future<bool> _wasUpdated(String path, ProcessRunner runner, StringSink stderr) async {
|
|
final ProcessRunnerResult diffResult = await runner.runProcess(<String>[
|
|
'git',
|
|
'diff',
|
|
'--name-only',
|
|
'--relative',
|
|
'master...HEAD',
|
|
'--',
|
|
path,
|
|
], failOk: true);
|
|
if (diffResult.exitCode != 0) {
|
|
stderr.writeln('git diff failed: ${diffResult.stdout}');
|
|
return false;
|
|
}
|
|
|
|
final String diffOutput = diffResult.stdout.trim();
|
|
return diffOutput.split('\n').contains(path);
|
|
}
|