mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
fix: content hash check for LUCI_CONTEXT (#176867)
When running on LUCI, the environment variable is LUCI_CONTEXT fixes: #176838
This commit is contained in:
parent
fa3ec5f88e
commit
4e8e4a95fa
@ -44,7 +44,7 @@ if (($currentBranch -ne "main") -and
|
||||
($currentBranch -ne "master") -and
|
||||
($currentBranch -ne "stable") -and
|
||||
($currentBranch -ne "beta") -and
|
||||
(-not (($currentBranch -eq "HEAD") -and (-not [string]::IsNullOrEmpty($env:LUCI_CI)))) -and
|
||||
(-not (($currentBranch -eq "HEAD") -and (-not [string]::IsNullOrEmpty($env:LUCI_CONTEXT)))) -and
|
||||
(-not $currentBranch.StartsWith("gh-readonly-queue/master/pr-")) -and
|
||||
(-not ($currentBranch -like "flutter-*-candidate.*")) -and
|
||||
(-not $isShallow)) {
|
||||
|
||||
@ -44,7 +44,7 @@ if [[ "$CURRENT_BRANCH" != "main" && \
|
||||
"$CURRENT_BRANCH" != "beta" && \
|
||||
"$CURRENT_BRANCH" != "gh-readonly-queue/master/pr-"* && \
|
||||
"$CURRENT_BRANCH" != "flutter-"*"-candidate."* && \
|
||||
! ( "$CURRENT_BRANCH" == "HEAD" && -n "$LUCI_CI" ) && \
|
||||
! ( "$CURRENT_BRANCH" == "HEAD" && -n "$LUCI_CONTEXT" ) && \
|
||||
! -f "$FLUTTER_ROOT/.git/shallow" ]]; then
|
||||
|
||||
# This is a development branch. Find the merge-base.
|
||||
|
||||
@ -231,7 +231,7 @@ void main() {
|
||||
);
|
||||
|
||||
// Simulate being in a LUCI environment.
|
||||
environment['LUCI_CI'] = 'true';
|
||||
environment['LUCI_CONTEXT'] = 'true';
|
||||
expect(runContentAwareHash(), processStdout('63a6c6dc494d9a2fc3e78e8505e878d129429246'));
|
||||
});
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user