diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml index e4f5ccb6..a52abce7 100644 --- a/engine/src/flutter/.ci.yaml +++ b/engine/src/flutter/.ci.yaml @@ -6,7 +6,7 @@ # More information at: # * https://github.com/flutter/cocoon/blob/main/CI_YAML.md enabled_branches: - - main + - master - flutter-\d+\.\d+-candidate\.\d+ - fuchsia_r\d+[a-z]* diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index c5c1c44f..b8d00841 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -1,7 +1,5 @@ ../../../.clang-format -../../../.git ../../../.gitattributes -../../../.github ../../../.gitignore ../../../.gn ../../../AUTHORS @@ -13,7 +11,6 @@ ../../../flutter/.clang-format ../../../flutter/.clang-tidy ../../../flutter/.dart_tool -../../../flutter/.git ../../../flutter/.gitattributes ../../../flutter/.github ../../../flutter/.gitignore @@ -21,7 +18,6 @@ ../../../flutter/AUTHORS ../../../flutter/CODEOWNERS ../../../flutter/CONTRIBUTING.md -../../../flutter/DEPS ../../../flutter/Doxyfile ../../../flutter/README.md ../../../flutter/analysis_options.yaml diff --git a/engine/src/flutter/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn index 08660b51..63f3cefe 100644 --- a/engine/src/flutter/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn +++ b/engine/src/flutter/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn @@ -5,6 +5,7 @@ assert(is_fuchsia) import("//flutter/common/config.gni") +import("//flutter/shell/version/version.gni") import("//flutter/testing/testing.gni") import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") @@ -59,7 +60,6 @@ template("make_utils") { action("generate_build_info_cc_file") { inputs = [ "build_info_in.cc", - "//flutter/.git/logs/HEAD", "//fuchsia/sdk/$host_os/meta/manifest.json", "$dart_src/.git/logs/HEAD", ] @@ -73,6 +73,8 @@ action("generate_build_info_cc_file") { rebase_path(outputs[0], root_build_dir), "--buildroot", rebase_path("//", root_build_dir), + "--engine-version", + engine_version, ] } diff --git a/engine/src/flutter/tools/fuchsia/make_build_info.py b/engine/src/flutter/tools/fuchsia/make_build_info.py index ea680a04..d5006f7c 100755 --- a/engine/src/flutter/tools/fuchsia/make_build_info.py +++ b/engine/src/flutter/tools/fuchsia/make_build_info.py @@ -52,10 +52,14 @@ def main(): parser.add_argument( '--buildroot', action='store', help='path to the flutter engine buildroot', required=True ) + parser.add_argument( + '--engine-version', action='store', help='Flutter engine commit hash', required=True + ) args = parser.parse_args() # Read, interpolate, write. with open(args.input, 'r') as i, open(args.output, 'w') as o: + # yapf: disable o.write( i.read().replace( '{{DART_SDK_GIT_REVISION}}', @@ -65,7 +69,7 @@ def main(): GetDartSdkSemanticVersion(args.buildroot).decode('utf-8') ).replace( '{{FLUTTER_ENGINE_GIT_REVISION}}', - GetFlutterEngineGitRevision(args.buildroot).decode('utf-8') + args.engine_version ).replace('{{FUCHSIA_SDK_VERSION}}', GetFuchsiaSdkVersion(args.buildroot)) )