Skip to content

Commit

Permalink
Merge branch 'flutter:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
vanlooverenkoen authored Sep 9, 2022
2 parents 4a34420 + 0725b10 commit 640db39
Show file tree
Hide file tree
Showing 521 changed files with 10,548 additions and 2,223 deletions.
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c873c2100ad79872cef92ab97dc96cc222dcdbf2
66c306b452282016e4a146a8f1c11f44836560f1
2 changes: 1 addition & 1 deletion .ci/flutter_stable.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f1875d570e39de09040c8f79aa13cc56baab8db1
ffccd96b62ee8cec7740dab303538c5fc26ac543
28 changes: 14 additions & 14 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ task:
depends_on: analyze
env:
matrix:
CHANNEL: "3.0.5"
CHANNEL: "2.10.5"
CHANNEL: "2.8.1"
package_prep_script:
# Allow analyzing plugins that use a Pigeon version with a higher
# minimum Flutter/Dart version than the plugin itself.
Expand Down Expand Up @@ -212,9 +212,9 @@ task:
- flutter config --enable-linux-desktop
- ./script/tool_runner.sh build-examples --linux
native_test_script:
- ./script/tool_runner.sh native-test --linux --no-integration
- xvfb-run ./script/tool_runner.sh native-test --linux --no-integration
drive_script:
- xvfb-run ./script/tool_runner.sh drive-examples --linux
- xvfb-run ./script/tool_runner.sh drive-examples --linux --exclude=script/configs/exclude_integration_linux.yaml

# Heavy-workload Linux tasks.
# These use machines with more CPUs and memory, so will reduce parallelization
Expand All @@ -237,11 +237,11 @@ task:
skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'
env:
matrix:
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 5"
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 5"
PLUGIN_SHARDING: "--shardIndex 2 --shardCount 5"
PLUGIN_SHARDING: "--shardIndex 3 --shardCount 5"
PLUGIN_SHARDING: "--shardIndex 4 --shardCount 5"
PACKAGE_SHARDING: "--shardIndex 0 --shardCount 5"
PACKAGE_SHARDING: "--shardIndex 1 --shardCount 5"
PACKAGE_SHARDING: "--shardIndex 2 --shardCount 5"
PACKAGE_SHARDING: "--shardIndex 3 --shardCount 5"
PACKAGE_SHARDING: "--shardIndex 4 --shardCount 5"
matrix:
CHANNEL: "master"
CHANNEL: "stable"
Expand Down Expand Up @@ -300,8 +300,8 @@ task:
- name: web-platform_tests
env:
matrix:
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
PACKAGE_SHARDING: "--shardIndex 0 --shardCount 2"
PACKAGE_SHARDING: "--shardIndex 1 --shardCount 2"
matrix:
CHANNEL: "master"
CHANNEL: "stable"
Expand Down Expand Up @@ -377,10 +377,10 @@ task:
env:
PATH: $PATH:/usr/local/bin
matrix:
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
PACKAGE_SHARDING: "--shardIndex 0 --shardCount 4"
PACKAGE_SHARDING: "--shardIndex 1 --shardCount 4"
PACKAGE_SHARDING: "--shardIndex 2 --shardCount 4"
PACKAGE_SHARDING: "--shardIndex 3 --shardCount 4"
matrix:
CHANNEL: "master"
CHANNEL: "stable"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@9fd24f1f9d6ceb64ba34d181b329ee72f99978a0
- uses: actions/labeler@e54e5b338fbd6e6cdb5d60f51c22335fc57c401e
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
sync-labels: true
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

# This workflow should be the last to run. So wait for all the other tests to succeed.
- name: Wait on all tests
uses: lewagon/wait-on-check-action@752bfae19aef55dab12a00bc36d48acc46b77e9d
uses: lewagon/wait-on-check-action@e2558238c09778af25867eb5de5a3ce4bbae3dcd
with:
ref: ${{ github.sha }}
running-workflow-name: 'release'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@3e15ea8318eee9b333819ec77a36aca8d39df13e
uses: ossf/scorecard-action@ce330fde6b1a5c9c75b417e7efc510b822a35564
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -48,6 +48,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@2ca79b6fa8d3ec278944088b4aa5f46912db5d63
uses: github/codeql-action/upload-sarif@c7f292ea4f542c473194b33813ccd4c207a6c725
with:
sarif_file: results.sarif
4 changes: 3 additions & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ packages/local_auth/** @stuartmorgan
packages/path_provider/** @gaaclarke
packages/plugin_platform_interface/** @stuartmorgan
packages/quick_actions/** @stuartmorgan
packages/shared_preferences/** @gaaclarke
packages/shared_preferences/** @tarrinneal
packages/url_launcher/** @stuartmorgan
packages/video_player/** @gaaclarke
packages/webview_flutter/** @bparrishMines
Expand All @@ -42,6 +42,7 @@ packages/video_player/video_player_android/** @camsim99

# - iOS
packages/camera/camera_avfoundation/** @hellohuanlin
packages/file_selector/file_selector_ios/** @jmagman
packages/google_maps_flutter/google_maps_flutter_ios/** @cyanglaz
packages/google_sign_in/google_sign_in_ios/** @jmagman
packages/image_picker/image_picker_ios/** @cyanglaz
Expand All @@ -56,6 +57,7 @@ packages/video_player/video_player_avfoundation/** @hellohuanlin
packages/webview_flutter/webview_flutter_wkwebview/** @cyanglaz

# - Linux
packages/file_selector/file_selector_linux/** @cbracken
packages/path_provider/path_provider_linux/** @cbracken
packages/shared_preferences/shared_preferences_linux/** @cbracken
packages/url_launcher/url_launcher_linux/** @cbracken
Expand Down
Loading

0 comments on commit 640db39

Please sign in to comment.