Merge branch 'master' of github.com:flutter/engine into drawAtlas

Author: jonahwilliams

.ci.yaml

@@ -8,7 +8,7 @@
 enabled_branches:
   - main
   - flutter-\d+\.\d+-candidate\.\d+
-  - fuchsia_r\d+
+  - fuchsia_r\d+[a-z]*
 
 platform_properties:
   linux:

.github/workflows/scorecards-analysis.yml

@@ -15,11 +15,11 @@ jobs:
     if: ${{ github.repository == 'flutter/engine' }}
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
         with:
           persist-credentials: false
       - name: "setup python"
-        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984
+        uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912
         with:
           python-version: '3.7.7' # install the python version needed
       - name: "execute py script"
@@ -38,11 +38,11 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
         with:
           persist-credentials: false
       - name: "Run analysis"
-        uses: ossf/scorecard-action@e363bfca00e752f91de7b7d2a77340e2e523cb18
+        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86
         with:
           results_file: results.sarif
           results_format: sarif
@@ -57,14 +57,14 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
         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@b2a92eb56d8cb930006a1c6ed86b0782dd8a4297
+        uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394
         with:
           sarif_file: results.sarif

.github/workflows/third_party_scan.yml

@@ -22,12 +22,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
         with:
           persist-credentials: false
 
       - name: setup python
-        uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6
+        uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912
         with:
           python-version: '3.7.7' # install the python version needed
 
@@ -43,14 +43,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
         with:
           name: SARIF file
           path: osvReport.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b2a92eb56d8cb930006a1c6ed86b0782dd8a4297
+        uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394
         with:
           sarif_file: osvReport.sarif

DEPS

@@ -35,14 +35,18 @@ PATH="$DART_BIN:$PATH"
 
 # Use:
 #   env VERBOSE=1 ./ci/licenses.sh
-# to turn on verbose progress report printing.
+# to turn on verbose progress report printing. Set it to 2 to also output
+# information about which patterns are taking the most time.
 QUIET="--quiet"
 if [[ "${VERBOSE}" == "1" ]]; then
   QUIET=""
 fi
+if [[ "${VERBOSE}" == "2" ]]; then
+  QUIET="--verbose"
+fi
 
 echo "Verifying license script is still happy..."
-echo "Using pub from $(command -v pub), dart from $(command -v dart)"
+echo "Using dart from: $(command -v dart)"
 
 untracked_files="$(cd "$SRC_DIR/flutter"; git status --ignored --short | grep -E "^!" | awk "{print\$2}")"
 untracked_count="$(echo "$untracked_files" | wc -l)"
@@ -58,6 +62,12 @@ fi
 
 dart --version
 
+# Runs the tests for the license script.
+function run_tests() (
+  cd "$SRC_DIR/flutter/tools/licenses"
+  find -name "*_test.dart" | xargs -n 1 dart --enable-asserts
+)
+
 # Collects the license information from the repo.
 # Runs in a subshell.
 function collect_licenses() (
@@ -117,11 +127,29 @@ function verify_licenses() (
       exitStatus=1
   fi
 
+  echo "Verifying excluded files list..."
+  if ! cmp -s "flutter/ci/licenses_golden/excluded_files" "out/license_script_output/excluded_files"; then
+      echo "============================= ERROR ============================="
+      echo "The license is excluding a different number of files than previously."
+      echo "This is only expected when new non-source files have been introduced."
+      echo "Verify that all the newly ignored files are definitely not shipped with"
+      echo "any binaries that we compile (including impellerc and Wasm)."
+      echo "If the changes look correct, update this file:"
+      echo "  ci/licenses_golden/excluded_files"
+      echo "For more information, see the script in:"
+      echo "  https://github.com/flutter/engine/tree/main/tools/licenses"
+      echo ""
+      diff -U 6 "flutter/ci/licenses_golden/excluded_files" "out/license_script_output/excluded_files"
+      echo "================================================================="
+      echo ""
+      exitStatus=1
+  fi
+
   echo "Checking license count in licenses_flutter..."
 
   local actualLicenseCount
   actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
-  local expectedLicenseCount=19 # When changing this number: Update the error message below as well describing all expected license types.
+  local expectedLicenseCount=20 # When changing this number: Update the error message below as well describing the newly expected license types.
 
   if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
       echo "=============================== ERROR ==============================="
@@ -145,4 +173,5 @@ function verify_licenses() (
   return $exitStatus
 )
 
+run_tests
 verify_licenses