diff --git a/dev/bots/docs.sh b/dev/bots/docs.sh index 21fed4fd7ef..4b613da98f8 100755 --- a/dev/bots/docs.sh +++ b/dev/bots/docs.sh @@ -116,7 +116,7 @@ function generate_docs() { # Install and activate the snippets tool, which resides in the # assets-for-api-docs repo: # https://github.com/flutter/assets-for-api-docs/tree/master/packages/snippets - "$DART" pub global activate snippets 0.4.2 + "$DART" pub global activate snippets 0.4.0 # This script generates a unified doc set, and creates # a custom index.html, placing everything into DOC_DIR. diff --git a/dev/snippets/config/skeletons/dartpad-sample.html b/dev/snippets/config/skeletons/dartpad-sample.html index d8ce7cafd31..9afc6233d90 100644 --- a/dev/snippets/config/skeletons/dartpad-sample.html +++ b/dev/snippets/config/skeletons/dartpad-sample.html @@ -13,7 +13,7 @@

{@end-inject-html} \ No newline at end of file diff --git a/dev/tools/create_api_docs.dart b/dev/tools/create_api_docs.dart index 150204cc1aa..12c49deb7d6 100644 --- a/dev/tools/create_api_docs.dart +++ b/dev/tools/create_api_docs.dart @@ -742,13 +742,14 @@ class DartdocGenerator { // Check a "dartpad" example, any one will do, and check for the correct URL // arguments. - // Just use "main" for any branch other than the LUCI_BRANCH. + // Just use "master" for any branch other than the LUCI_BRANCH. final String? luciBranch = platform.environment['LUCI_BRANCH']?.trim(); - final String expectedBranch = luciBranch != null && luciBranch.isNotEmpty ? luciBranch : 'main'; + final String expectedBranch = luciBranch != null && luciBranch.isNotEmpty ? luciBranch : 'master'; final List argumentRegExps = [ r'split=\d+', r'run=true', r'sample_id=widgets\.Listener\.\d+', + 'sample_channel=$expectedBranch', 'channel=$expectedBranch', ]; for (final String argumentRegExp in argumentRegExps) { diff --git a/dev/tools/test/create_api_docs_test.dart b/dev/tools/test/create_api_docs_test.dart index 560eaef5902..8e6d8e6f739 100644 --- a/dev/tools/test/create_api_docs_test.dart +++ b/dev/tools/test/create_api_docs_test.dart @@ -441,7 +441,7 @@ void main() { '''); - const String queryParams = 'split=1&run=true&sample_id=widgets.Listener.123&channel=main'; + const String queryParams = 'split=1&run=true&sample_id=widgets.Listener.123&sample_channel=master&channel=master'; widgetsDir.childFile('Listener-class.html').writeAsStringSync('''