Skip to content

Commit 4ab2102

Browse files
auto-submit[bot]auto-submit[bot]
and
auto-submit[bot]
authored
Reverts "Content aware hash moved to script and tracked (flutter#166717)" (flutter#166864)
<!-- start_original_pr_link --> Reverts: flutter#166717 <!-- end_original_pr_link --> <!-- start_initiating_author --> Initiated by: matanlurey <!-- end_initiating_author --> <!-- start_revert_reason --> Reason for reverting: Broke tree on [postsubmit](https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8718108088961866849/+/u/test:_run_suite_safari-dart2js-canvaskit-engine/stdout) <!-- end_revert_reason --> <!-- start_original_pr_author --> Original PR Author: jtmcdole <!-- end_original_pr_author --> <!-- start_reviewers --> Reviewed By: {matanlurey} <!-- end_reviewers --> <!-- start_revert_body --> This change reverts the following previous change: 1. Calculate the hash in only two places: `content_aware_hash.{ps1|sh}` 2. Call this from the workflow 3. Eventually call this from `update_engine_version.{ps1|sh}` The files of import: * `DEPS`: tracks third party dependencies related to building the engine * `engine`: all the code in the engine folder * `bin/internal/content_aware_hash.ps1`: script for calculating the hash on windows * `bin/internal/content_aware_hash.sh`: script for calculating the hash on mac/linux * `.github/workflows/content-aware-hash.yml`: github action for CI/CD hashing Tested on windows and mac: ```shell PS C:\src\flutter> C:\src\flutter\bin\internal\content_aware_hash.ps1 c24231e276e0719738e175e0622e040ad21a7012 ``` ```shell ❯ ~/src/flutter/bin/internal/content_aware_hash.sh c24231e276e0719738e175e0622e040ad21a7012 ``` <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <[email protected]>
1 parent 47ea86a commit 4ab2102

File tree

6 files changed

+1
-377
lines changed

6 files changed

+1
-377
lines changed

.github/workflows/content-aware-hash.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
2020
- name: Generate Hash
2121
run: |
22-
engine_content_hash=$(bin/internal/content_aware_hash.sh)
22+
engine_content_hash=$(git ls-tree HEAD DEPS bin/internal/release-candidate-branch.version engine | git hash-object --stdin)
2323
# test notice annotation for retrival from api
2424
echo "::notice ::{\"engine_content_hash\": \"${engine_content_hash}\"}"
2525
# test summary writing

bin/internal/content_aware_hash.ps1

-29
This file was deleted.

bin/internal/content_aware_hash.sh

-28
This file was deleted.

dev/bots/analyze.dart

-1
Original file line numberDiff line numberDiff line change
@@ -2599,7 +2599,6 @@ const Set<String> kExecutableAllowlist = <String>{
25992599
'bin/flutter-dev',
26002600
'bin/internal/update_dart_sdk.sh',
26012601
'bin/internal/update_engine_version.sh',
2602-
'bin/internal/content_aware_hash.sh',
26032602

26042603
'dev/bots/codelabs_build_test.sh',
26052604
'dev/bots/docs.sh',

dev/tools/test/content_aware_hash_test.dart

-315
This file was deleted.

0 commit comments

Comments
 (0)