Stable

.ci.yaml

@@ -216,9 +216,6 @@ targets:
       validation_name: Customer testing
 
   - name: Linux docs_publish
-    enabled_branches:
-      - main
-      - master
     recipe: flutter/flutter
     presubmit: false
     timeout: 60
@@ -234,6 +231,7 @@ targets:
       validation_name: Docs
       firebase_project: master-docs-flutter-dev
       release_ref: refs/heads/master
+      release_build: "true"
 
   - name: Linux docs_test
     recipe: flutter/flutter
@@ -4334,3 +4332,106 @@ targets:
         ["devicelab", "android", "windows"]
       task_name: windows_chrome_dev_mode
     scheduler: luci
+
+  - name: Linux flutter_packaging
+    recipe: packaging_v2/packaging_v2
+    timeout: 60
+    scheduler: release
+    bringup: true
+    enabled_branches:
+      - beta
+      - stable
+      - main
+    properties:
+      task_name: flutter_packaging
+      tags: >
+        ["framework", "hostonly", "shard", "linux"]
+
+  - name: Mac flutter_packaging
+    recipe: packaging_v2/packaging_v2
+    timeout: 60
+    scheduler: release
+    bringup: true
+    enabled_branches:
+      - beta
+      - stable
+      - main
+    properties:
+      task_name: flutter_packaging
+      tags: >
+        ["framework", "hostonly", "shard", "mac"]
+
+
+  - name: Mac_arm64 flutter_packaging
+    recipe: packaging_v2/packaging_v2
+    timeout: 60
+    scheduler: release
+    bringup: true
+    enabled_branches:
+      - beta
+      - stable
+      - main
+    properties:
+      task_name: flutter_packaging
+      tags: >
+        ["framework", "hostonly", "shard", "mac"]
+    dimensions:
+      cpu: "arm64"
+
+  - name: Windows flutter_packaging
+    recipe: packaging_v2/packaging_v2
+    timeout: 60
+    scheduler: release
+    bringup: true
+    enabled_branches:
+      - beta
+      - stable
+      - main
+    properties:
+      task_name: flutter_packaging
+      tags: >
+        ["framework", "hostonly", "shard", "windows"]
+
+
+  - name: Linux docs_deploy_beta
+    recipe: flutter/flutter
+    scheduler: release
+    bringup: true
+    enabled_branches:
+      - beta
+      - main
+    presubmit: false
+    timeout: 60
+    properties:
+      cores: "32"
+      dependencies: >-
+        [
+          {"dependency": "dashing", "version": "0.4.0"},
+          {"dependency": "firebase", "version": "v11.0.1"}
+        ]
+      tags: >
+        ["framework", "hostonly", "linux"]
+      validation: docs_deploy
+      validation_name: Docs_deploy
+      firebase_project: master-docs-flutter-dev
+
+  - name: Linux docs_deploy_stable
+    recipe: flutter/flutter
+    scheduler: release
+    bringup: true
+    enabled_branches:
+      - stable
+    presubmit: false
+    timeout: 60
+    properties:
+      cores: "32"
+      dependencies: >-
+        [
+          {"dependency": "dashing", "version": "0.4.0"},
+          {"dependency": "firebase", "version": "v11.0.1"}
+        ]
+      tags: >
+        ["framework", "hostonly", "linux"]
+      validation: docs_deploy
+      validation_name: Docs_deploy
+      firebase_project: docs-flutter-dev

.cirrus.yml

@@ -12,7 +12,7 @@ environment:
   # dependency on precisely how Cirrus is detected by our tools.
   BOT: "true"
 
-gcp_credentials: ENCRYPTED[!ebad0a1f4f7a446b77944c33651460a7ab010b4617273cb016cf354eb8fc22aa92e37a3c58bfa4a0c40a799351e027a6!]
+gcp_credentials: ENCRYPTED[!f1177d1ddb5330ffaa9ea11c9c9e8e0c542185e895c36071f18cec923dd31c50ece6d18da89c2f6f1cd2d1a98d0c2eea!]
 
 # LINUX SHARDS
 task:
@@ -68,7 +68,7 @@ task:
       - which flutter
   matrix:
     - name: analyze-linux # linux-only
-      only_if: "$CIRRUS_PR != ''"
+      only_if: "$CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
       environment:
         # Empirically, the analyze-linux shard runs surprisingly fast (under 15 minutes) with just 1
         # CPU.  We noticed OOM failures with 6GB 4/2020, so we increased the memory.
@@ -78,7 +78,7 @@ task:
         - dart --enable-asserts ./dev/bots/analyze.dart
 
     - name: framework_tests-widgets-linux
-      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != ''"
+      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
       environment:
         # We use 3 CPUs because that's the minimum required to get framework_tests-widgets-linux
         # running fast enough that it is not the long pole, as of October 2019.
@@ -87,7 +87,7 @@ task:
         - dart --enable-asserts ./dev/bots/test.dart
 
     - name: framework_tests-libraries-linux
-      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != ''"
+      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
       environment:
         # We use 3 CPUs because that's the minimum required to get the
         # framework_tests-libraries-linux shard running fast enough that it is not the long pole, as
@@ -98,7 +98,7 @@ task:
 
     - name: framework_tests-misc-linux
       # this includes the tests for directories in dev/
-      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_goldens/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != ''"
+      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_goldens/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
       environment:
         # We use 3 CPUs because that's the minimum required to get framework_tests-misc-linux
         # running fast enough that it is not the long pole, as of October 2019.
@@ -107,7 +107,7 @@ task:
         - dart --enable-asserts ./dev/bots/test.dart
 
     - name: tool_tests-general-linux
-      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != ''"
+      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
       environment:
         # As of November 2019, the tool_tests-general-linux shard got faster with more CPUs up to 4
         # CPUs, and needed at least 10G of RAM to not run out of memory.
@@ -122,7 +122,7 @@ task:
         - dart --enable-asserts ./dev/bots/test.dart
 
     - name: tool_tests-commands-linux
-      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != ''"
+      only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
       environment:
         # As of October 2019, the tool_tests-commands-linux shard got faster with more CPUs up to 6
         # CPUs, and needed at least 8G of RAM to not run out of memory.
@@ -139,12 +139,12 @@ task:
       environment:
         CPU: 4
         MEMORY: 12G
-      only_if: "$CIRRUS_PR != ''"
+      only_if: "$CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
       script:
         - ./dev/bots/docs.sh
 
     - name: customer_testing-linux
-      only_if: "$CIRRUS_PR != ''"
+      only_if: "$CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
       environment:
         # Empirically, this shard runs fine at 1 CPU and 4G RAM as of October 2019. We will probably
         # want to grow this container when we invite people to add their tests in large numbers.

TESTOWNERS

@@ -262,3 +262,4 @@
 # skp_generator @Hixie
 # test_ownership @keyonghan
 # verify_binaries_codesigned @christopherfujino @flutter/releases
+# flutter_packaging @godofredoc @flutter/infra

bin/internal/engine.version

@@ -1 +1 @@
-24a1b60e7fd172158b3aae034281a8856b7db626
+3316dd8728419ad3534e3f6112aa6291f587078a

bin/internal/flutter_plugins.version

@@ -1 +1 @@
-8ed5e3f3ce0c5099031f156693ce35638676652e
+e183aec328ead613b4ccc3c1f541327d0acdc80b

bin/internal/release-candidate-branch.version

@@ -0,0 +1 @@
+flutter-3.2-candidate.5

dev/bots/docs.sh

@@ -148,3 +148,7 @@ if [[ -n "$LUCI_CI" && -z "$LUCI_PR" ]]; then
   (cd "$FLUTTER_ROOT/dev/docs"; move_offline_into_place)
   deploy_docs
 fi
+
+# Zip docs
+cd "$FLUTTER_ROOT/dev/docs"
+zip api_docs.zip doc

dev/bots/post_process_docs.dart

@@ -0,0 +1,155 @@
+// 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:convert';
+import 'dart:io';
+import 'package:intl/intl.dart';
+import 'package:meta/meta.dart';
+
+import 'package:path/path.dart' as path;
+import 'package:platform/platform.dart' as platform;
+
+import 'package:process/process.dart';
+
+const String kDocsRoot = 'dev/docs';
+const String kPublishRoot = '$kDocsRoot/doc';
+
+class CommandException implements Exception {}
+
+Future<void> main() async {
+  await postProcess();
+}
+
+/// Post-processes an APIs documentation zip file to modify the footer and version
+/// strings for commits promoted to either beta or stable channels.
+Future<void> postProcess() async {
+  final String revision = await gitRevision(fullLength: true);
+  print('Docs revision being processed: $revision');
+  final Directory tmpFolder = Directory.systemTemp.createTempSync();
+  final String zipDestination = path.join(tmpFolder.path, 'api_docs.zip');
+
+  if (!Platform.environment.containsKey('SDK_CHECKOUT_PATH')) {
+    print('SDK_CHECKOUT_PATH env variable is required for this script');
+    exit(1);
+  }
+  final String checkoutPath = Platform.environment['SDK_CHECKOUT_PATH']!;
+  final String docsPath = path.join(checkoutPath, 'dev', 'docs');
+  await runProcessWithValidations(
+    <String>[
+      'curl',
+      '-L',
+      'https://storage.googleapis.com/flutter_infra_release/flutter/$revision/api_docs.zip',
+      '--output',
+      zipDestination,
+      '--fail',
+    ],
+    docsPath,
+  );
+
+  // Unzip to docs folder.
+  await runProcessWithValidations(
+    <String>[
+      'unzip',
+      '-o',
+      zipDestination,
+    ],
+    docsPath,
+  );
+
+  // Generate versions file.
+  await runProcessWithValidations(
+    <String>['flutter', '--version'],
+    docsPath,
+  );
+  final File versionFile = File('version');
+  final String version = versionFile.readAsStringSync();
+  // Recreate footer
+  final String publishPath = path.join(docsPath, '..', 'docs', 'doc', 'flutter', 'footer.js');
+  final File footerFile = File(publishPath)..createSync(recursive: true);
+  createFooter(footerFile, version);
+}
+
+/// Gets the git revision of the current checkout. [fullLength] if true will return
+/// the full commit hash, if false it will return the first 10 characters only.
+Future<String> gitRevision({
+  bool fullLength = false,
+  @visibleForTesting platform.Platform platform = const platform.LocalPlatform(),
+  @visibleForTesting ProcessManager processManager = const LocalProcessManager(),
+}) async {
+  const int kGitRevisionLength = 10;
+
+  final ProcessResult gitResult = processManager.runSync(<String>['git', 'rev-parse', 'HEAD']);
+  if (gitResult.exitCode != 0) {
+    throw 'git rev-parse exit with non-zero exit code: ${gitResult.exitCode}';
+  }
+  final String gitRevision = (gitResult.stdout as String).trim();
+  if (fullLength) {
+    return gitRevision;
+  }
+  return gitRevision.length > kGitRevisionLength ? gitRevision.substring(0, kGitRevisionLength) : gitRevision;
+}
+
+/// Wrapper function to run a subprocess checking exit code and printing stderr and stdout.
+/// [executable] is a string with the script/binary to execute, [args] is the list of flags/arguments
+/// and [workingDirectory] is as string to the working directory where the subprocess will be run.
+Future<void> runProcessWithValidations(
+  List<String> command,
+  String workingDirectory, {
+  @visibleForTesting ProcessManager processManager = const LocalProcessManager(),
+}) async {
+  final ProcessResult result =
+      processManager.runSync(command, stdoutEncoding: utf8, workingDirectory: workingDirectory);
+  if (result.exitCode == 0) {
+    print('Stdout: ${result.stdout}');
+  } else {
+    print('StdErr: ${result.stderr}');
+    throw CommandException();
+  }
+}
+
+/// Get the name of the release branch.
+///
+/// On LUCI builds, the git HEAD is detached, so first check for the env
+/// variable "LUCI_BRANCH"; if it is not set, fall back to calling git.
+Future<String> getBranchName({
+  @visibleForTesting platform.Platform platform = const platform.LocalPlatform(),
+  @visibleForTesting ProcessManager processManager = const LocalProcessManager(),
+}) async {
+  final RegExp gitBranchRegexp = RegExp(r'^## (.*)');
+  final String? luciBranch = platform.environment['LUCI_BRANCH'];
+  if (luciBranch != null && luciBranch.trim().isNotEmpty) {
+    return luciBranch.trim();
+  }
+  final ProcessResult gitResult = processManager.runSync(<String>['git', 'status', '-b', '--porcelain']);
+  if (gitResult.exitCode != 0) {
+    throw 'git status exit with non-zero exit code: ${gitResult.exitCode}';
+  }
+  final RegExpMatch? gitBranchMatch = gitBranchRegexp.firstMatch((gitResult.stdout as String).trim().split('\n').first);
+  return gitBranchMatch == null ? '' : gitBranchMatch.group(1)!.split('...').first;
+}
+
+/// Updates the footer of the api documentation with the correct branch and versions.
+/// [footerPath] is the path to the location of the footer js file and [version] is a
+/// string with the version calculated by the flutter tool.
+Future<void> createFooter(File footerFile, String version,
+    {@visibleForTesting String? timestampParam,
+    @visibleForTesting String? branchParam,
+    @visibleForTesting String? revisionParam}) async {
+  final String timestamp = timestampParam ?? DateFormat('yyyy-MM-dd HH:mm').format(DateTime.now());
+  final String gitBranch = branchParam ?? await getBranchName();
+  final String revision = revisionParam ?? await gitRevision();
+  final String gitBranchOut = gitBranch.isEmpty ? '' : '• $gitBranch';
+  footerFile.writeAsStringSync('''
+(function() {
+  var span = document.querySelector('footer>span');
+  if (span) {
+    span.innerText = 'Flutter $version • $timestamp • $revision $gitBranchOut';
+  }
+  var sourceLink = document.querySelector('a.source-link');
+  if (sourceLink) {
+    sourceLink.href = sourceLink.href.replace('/master/', '/$revision/');
+  }
+})();
+''');
+}

dev/bots/pubspec.yaml

@@ -7,6 +7,7 @@ environment:
 dependencies:
   args: 2.3.1
   crypto: 3.0.2
+  intl: 0.17.0
   flutter_devicelab:
     path: ../devicelab
   http_parser: 4.0.1
@@ -69,4 +70,4 @@ dependencies:
 dev_dependencies:
   test_api: 0.4.12
 
-# PUBSPEC CHECKSUM: b99a
+# PUBSPEC CHECKSUM: d1d2