Unverified Commit 41eeb2bb authored by Michael Goderbauer's avatar Michael Goderbauer Committed by GitHub

Use dartpad's main channel for master/main docs (#144329)

Dartpad doesn't have a "master" channel anymore, it got renamed to "main". Sadly, specifying "master" is now falling back to "stable" which breaks some of our examples in the docs that require a more current Flutter version, e.g. https://main-api.flutter.dev/flutter/material/TextButton-class.html
parent bcb0f901
...@@ -116,7 +116,7 @@ function generate_docs() { ...@@ -116,7 +116,7 @@ function generate_docs() {
# Install and activate the snippets tool, which resides in the # Install and activate the snippets tool, which resides in the
# assets-for-api-docs repo: # assets-for-api-docs repo:
# https://github.com/flutter/assets-for-api-docs/tree/master/packages/snippets # https://github.com/flutter/assets-for-api-docs/tree/master/packages/snippets
"$DART" pub global activate snippets 0.4.0 "$DART" pub global activate snippets 0.4.2
# This script generates a unified doc set, and creates # This script generates a unified doc set, and creates
# a custom index.html, placing everything into DOC_DIR. # a custom index.html, placing everything into DOC_DIR.
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</p> </p>
</div> </div>
<iframe class="snippet-dartpad" <iframe class="snippet-dartpad"
src="https://dartpad.dev/embed-flutter.html?split=60&amp;run=true&amp;sample_id={{id}}&amp;sample_channel={{channel}}&amp;channel={{channel}}"> src="https://dartpad.dev/embed-flutter.html?split=60&amp;run=true&amp;sample_id={{id}}&amp;channel={{channel}}">
</iframe> </iframe>
</div> </div>
{@end-inject-html} {@end-inject-html}
\ No newline at end of file
...@@ -742,14 +742,13 @@ class DartdocGenerator { ...@@ -742,14 +742,13 @@ class DartdocGenerator {
// Check a "dartpad" example, any one will do, and check for the correct URL // Check a "dartpad" example, any one will do, and check for the correct URL
// arguments. // arguments.
// Just use "master" for any branch other than the LUCI_BRANCH. // Just use "main" for any branch other than the LUCI_BRANCH.
final String? luciBranch = platform.environment['LUCI_BRANCH']?.trim(); final String? luciBranch = platform.environment['LUCI_BRANCH']?.trim();
final String expectedBranch = luciBranch != null && luciBranch.isNotEmpty ? luciBranch : 'master'; final String expectedBranch = luciBranch != null && luciBranch.isNotEmpty ? luciBranch : 'main';
final List<String> argumentRegExps = <String>[ final List<String> argumentRegExps = <String>[
r'split=\d+', r'split=\d+',
r'run=true', r'run=true',
r'sample_id=widgets\.Listener\.\d+', r'sample_id=widgets\.Listener\.\d+',
'sample_channel=$expectedBranch',
'channel=$expectedBranch', 'channel=$expectedBranch',
]; ];
for (final String argumentRegExp in argumentRegExps) { for (final String argumentRegExp in argumentRegExps) {
......
...@@ -441,7 +441,7 @@ void main() { ...@@ -441,7 +441,7 @@ void main() {
</code> </code>
</pre> </pre>
'''); ''');
const String queryParams = 'split=1&run=true&sample_id=widgets.Listener.123&sample_channel=master&channel=master'; const String queryParams = 'split=1&run=true&sample_id=widgets.Listener.123&channel=main';
widgetsDir.childFile('Listener-class.html').writeAsStringSync(''' widgetsDir.childFile('Listener-class.html').writeAsStringSync('''
<iframe class="snippet-dartpad" src="https://dartpad.dev/embed-flutter.html?$queryParams"> <iframe class="snippet-dartpad" src="https://dartpad.dev/embed-flutter.html?$queryParams">
</iframe> </iframe>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment