Skip to content

Commit

Permalink
Merge pull request #23 from BlueBubblesApp/zach/flutter3/master-merge
Browse files Browse the repository at this point in the history
Zach/flutter3/master merge
  • Loading branch information
zlshames authored May 14, 2022
2 parents 0791c09 + e9ea758 commit 1cb1b53
Show file tree
Hide file tree
Showing 2,387 changed files with 141,890 additions and 51,833 deletions.
2,469 changes: 1,351 additions & 1,118 deletions .ci.yaml

Large diffs are not rendered by default.

22 changes: 2 additions & 20 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ environment:
# dependency on precisely how Cirrus is detected by our tools.
BOT: "true"

gcp_credentials: ENCRYPTED[!48cff44dd32e9cc412d4d381c7fe68d373ca04cf2639f8192d21cb1a9ab5e21129651423a1cf88f3fd7fe2125c1cabd9!]
gcp_credentials: ENCRYPTED[!2c88dee9c9d9805b214c9f7ad8f3bc8fae936cdb0f881d562101151c408c7e024a41222677d5831df90c60d2dd6cd80a!]

# LINUX SHARDS
task:
gke_container:
dockerfile: "dev/ci/docker_linux/Dockerfile"
builder_image_name: docker-builder # gce vm image
builder_image_name: docker-builder-linux # gce vm image
builder_image_project: flutter-cirrus
cluster_name: test-cluster
zone: us-central1-a
Expand Down Expand Up @@ -156,21 +156,3 @@ task:
- git fetch origin master:master
# The actual logic is in a shell script so that it can be shared between CIs.
- (cd dev/customer_testing/; ./ci.sh)

- name: web_smoke_test
only_if: "changesInclude('.cirrus.yml', 'examples/hello_world/**' ,'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'packages/flutter_web_plugins/**', 'bin/**') && $CIRRUS_PR != ''"
environment:
# Tests Hello World with Flutter Web Engine using Flutter Driver. Should not need more resources.
CPU: 2
MEMORY: 2G
CHROME_NO_SANDBOX: true
script:
- flutter config --enable-web
- git clone https://github.com/flutter/web_installers.git
- cd web_installers/packages/web_drivers/
- dart __deprecated_pub get
- dart lib/web_driver_installer.dart chromedriver --install-only
- chromedriver/chromedriver --port=4444 &
- sleep 1
- cd ../../../examples/hello_world/
- flutter drive --target=test_driver/smoke_web_engine.dart -d web-server --profile --browser-name=chrome
66 changes: 66 additions & 0 deletions .github/ISSUE_TEMPLATE/7_cherry_pick.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Request a cherry-pick.
description: As a contributor, you would like to request that a feature be cherry-picked into a release.
title: '[CP] <title>'
labels: ['cp: review']
body:
- type: input
id: issue_link
attributes:
label: issue_link
description: What is the link to the issue this cherry-pick is addressing?
validations:
required: true
- type: input
id: commit_hash
attributes:
label: Commit Hash
description: What is the shortened commit hash that has been merged to master/main?
validations:
required: true
- type: input
id: impacted_users
attributes:
label: Impacted Users
description: Approximately who will hit this issue (ex. all Flutter devs, Windows developers, all end-customers, apps using X framework feature)?
validations:
required: true
- type: textarea
id: impact_description
attributes:
label: Impact Description
description: What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)? Does it impact development (ex. flutter doctor crashes when Android Studio is installed), or the shipping production app (the app crashes on launch)
validations:
required: true
- type: textarea
id: workaround
attributes:
label: Workaround
description: Is there a workaround for this issue?
validations:
required: true
- type: dropdown
id: risk
attributes:
label: Risk
description: What is the risk level of this cherry-pick?
options:
- low
- medium
- high
validations:
required: true
- type: dropdown
id: test_coverage
attributes:
label: Test Coverage
description: Are you confident that your fix is well-tested by automated tests?
options:
- "yes"
- "no"
validations:
required: true
- type: textarea
id: fix_steps
attributes:
label: Validation Steps
description: What are the steps to validate that this fix works?
25 changes: 24 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,30 @@ updates:
reviewers:
- "jmagman"
- "keyonghan"
- "yusufm"
- "yusuf-goog"
labels:
- "team"
- "team: infra"
- "waiting for tree to go green"
- package-ecosystem: "docker"
directory: "/dev/ci/docker_linux"
schedule:
interval: "weekly"
reviewers:
- "keyonghan"
- "yusuf-goog"
- "christopherfujino"
labels:
- "team"
- "team: infra"
- "waiting for tree to go green"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
reviewers:
- "hixie"
- "godofredoc"
labels:
- "team"
- "team: infra"
Expand Down
18 changes: 18 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
changelog:
exclude:
authors:
- engine-flutter-autoroll
- fluttergithubbot
labels:
- passed first triage
- passed secondary triage
categories:
- title: Framework
labels:
- framework
- title: Tooling
labels:
- tool
- title: MacOS
labels:
- platform-mac
11 changes: 8 additions & 3 deletions .github/workflows/lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

name: 'Lock Threads'

# By specifying the access of one of the scopes, all of those that are not
# specified are set to 'none'.
permissions:
issues: write

on:
schedule:
- cron: '0 * * * *'
Expand All @@ -13,13 +18,13 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.repository == 'flutter/flutter' }}
steps:
- uses: dessant/lock-threads@486f7380c15596f92b724e4260e4981c68d6bde6
- uses: dessant/lock-threads@e460dfeb36e731f3aeb214be6b0c9a9d9a67eda6
with:
process-only: 'issues'
github-token: ${{ github.token }}
# Number of days of inactivity before a closed issue is locked.
issue-lock-inactive-days: '14'
issue-lock-comment: >
issue-inactive-days: '14'
issue-comment: >
This thread has been automatically locked since there has not been
any recent activity after it was closed. If you are still experiencing a
similar issue, please open a new bug, including the output of
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/no-response.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.repository == 'flutter/flutter' }}
steps:
- uses: lee-dohm/no-response@9bb0a4b5e6a45046f00353d5de7d90fb8bd773bb
- uses: godofredoc/no-response@0ce2dc0e63e1c7d2b87752ceed091f6d32c9df09
with:
token: ${{ github.token }}
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
Expand Down
54 changes: 54 additions & 0 deletions .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Scorecards supply-chain security
on:
# Only the default branch is supported.
branch_protection_rule:
push:
branches: [ master ]

# Declare default permissions as read only.
permissions: read-all

jobs:
analysis:
name: Scorecards analysis
runs-on: ubuntu-latest
if: ${{ github.repository == 'flutter/flutter' }}
permissions:
# Needed to upload the results to code-scanning dashboard.
security-events: write
actions: read
contents: read

steps:
- name: "Checkout code"
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@c1aec4ac820532bab364f02a81873c555a0ba3a1
with:
results_file: results.sarif
results_format: sarif
# Read-only PAT token. To create it,
# follow the steps in https://github.com/ossf/scorecard-action#pat-token-creation.
repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
# Publish the results to enable scorecard badges. For more details, see
# https://github.com/ossf/scorecard-action#publishing-results.
# For private repositories, `publish_results` will automatically be set to `false`,
# regardless of the value entered here.
publish_results: true

# Upload the results as artifacts (optional).
- name: "Upload artifact"
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@28eead240834b314f7def40f6fcba65d100d99b1
with:
sarif_file: results.sarif
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ unlinked_spec.ds

# macOS
**/macos/Flutter/GeneratedPluginRegistrant.swift
**/macos/Flutter/ephemeral

# Coverage
coverage/
Expand Down
4 changes: 4 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,7 @@ Pradumna Saraf <[email protected]>
Kai Yu <[email protected]>
Denis Grafov <[email protected]>
TheOneWithTheBraid <[email protected]>
Alberto Miola <[email protected]>
Twin Sun, LLC <[email protected]>
Taskulu LDA <[email protected]>
Jonathan Joelson <[email protected]>
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Use git ls-files '<pattern>' without a / prefix to see the list of matching files.

/CODEOWNERS @jmagman
/.ci.yaml @keyonghan @caseyhillers
/.ci.yaml @keyonghan
/dev/ci/ @christopherfujino
/packages/flutter_goldens @Piinks
/packages/flutter_goldens_client @Piinks
Expand Down
16 changes: 9 additions & 7 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

# Code of conduct

We expect Flutter's contributors to act professionally and respectfully, and
we expect our social spaces to be safe and dignified environments.
The Flutter project expects Flutter's contributors to act professionally
and respectfully. Flutter contributors are expected to maintain the safety
and dignity of Flutter's social environments (such as GitHub and Discord).

Specifically:

Expand All @@ -13,10 +14,11 @@ Specifically:

Should you experience anything that makes you feel unwelcome in Flutter's
community, please contact [[email protected]](mailto:[email protected])
or, if you prefer, directly contact someone on the team, for instance
[Hixie](mailto:[email protected]) or [Tim](mailto:[email protected]). We will
not tolerate harassment from anyone in Flutter's community, even outside
of Flutter's public communication channels.
or, if you prefer, directly contact someone on the project, for instance
[Hixie](mailto:[email protected]) or [Tim](mailto:[email protected]).

The Flutter project will not tolerate harassment in Flutter's
community, even outside of Flutter's public communication channels.

## Conflict resolution

Expand All @@ -27,7 +29,7 @@ together, try to understand each other's points of view, and work to
find a design that addresses everyone's concerns.

This is usually sufficient to resolve issues. If you cannot come to an
agreement, ask for the advice of a more senior member of the team.
agreement, ask for the advice of a more senior member of the project.

Be wary of agreement by attrition, where one person argues a point
repeatedly until other participants give up in the interests of moving
Expand Down
11 changes: 8 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ If you want to help us triage, you are very welcome to do so!
Developing for Flutter
----------------------

If you would prefer to write code, you may wish to start with our list of [good first contributions](https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+contribution%22).

To develop for Flutter, you will eventually need to become familiar
with our processes and conventions. This section lists the documents
that describe these methodologies. The following list is ordered: you
Expand Down Expand Up @@ -97,8 +99,11 @@ presented.
which should be used when proposing a new technical design. This is a good
practice to do before coding more intricate changes.

In addition to the above, there are many pages on [our
Wiki](https://github.com/flutter/flutter/wiki/) and an article [Contributing to Flutter:
Getting Started](https://medium.com/@ayushbherwani/contributing-to-flutter-getting-started-a0db68cbcd5b)
[![How to contribute to Flutter](https://img.youtube.com/vi/4yBgOBAOx_A/0.jpg)](https://www.youtube.com/watch?v=4yBgOBAOx_A)

In addition to the documents, there is a video linked above on **How to contribute to Flutter**
from the [Flutter](https://youtube.com/c/flutterdev) YouTube channel,
there are many pages on [our Wiki](https://github.com/flutter/flutter/wiki/),
and an article [Contributing to Flutter: Getting Started](https://medium.com/@ayushbherwani/contributing-to-flutter-getting-started-a0db68cbcd5b)
on Medium that may be of interest. For a curated list of pages see the sidebar
on the wiki's home page. They are more or less listed in order of importance.
Loading

0 comments on commit 1cb1b53

Please sign in to comment.