firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit engine.realm as empty (#160541)

Browse Source 
- only set it when the environment FLUTTER_REALM is present
This commit is contained in:
John McDole 2024-12-18 18:48:45 -08:00 committed by GitHub
parent f0bf495594
commit d14259a25d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,7 +3,6 @@
# This is dynamic in a monorepo # This is dynamic in a monorepo
bin/internal/engine.version bin/internal/engine.version
bin/internal/engine.realm
# Miscellaneous # Miscellaneous
*.class *.class

0
bin/internal/engine.realm Normal file
View File

18
bin/internal/update_dart_sdk.ps1
View File

@ -41,25 +41,11 @@ if ((Test-Path "$flutterRoot\DEPS" -PathType Leaf) -and (Test-Path "$flutterRoot
# The realm on CI is passed in. # The realm on CI is passed in.
if ($Env:FLUTTER_REALM) { if ($Env:FLUTTER_REALM) {
[System.IO.File]::WriteAllText("$flutterRoot\bin\internal\engine.realm", $Env:FLUTTER_REALM, $utf8NoBom) [System.IO.File]::WriteAllText("$flutterRoot\bin\internal\engine.realm", $Env:FLUTTER_REALM, $utf8NoBom)
$engineRealm = "$Env:FLUTTER_REALM"
}
else {
if (Test-Path -Path "$flutterRoot\bin\internal\engine.realm") {
$engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm")
}
} }
} }
else {
# Release branch - these files will exist
$engineVersion = (Get-Content "$flutterRoot\bin\internal\engine.version")
$engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm")
}
}
else {
# Non-fusion repository - these files will exist
$engineVersion = (Get-Content "$flutterRoot\bin\internal\engine.version")
$engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm")
} }
$engineVersion = (Get-Content "$flutterRoot\bin\internal\engine.version")
$engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm")
$oldDartSdkPrefix = "dart-sdk.old" $oldDartSdkPrefix = "dart-sdk.old"

15
bin/internal/update_dart_sdk.sh
View File

@ -39,22 +39,11 @@ if [ -f "$FLUTTER_ROOT/DEPS" ] && [ -f "$FLUTTER_ROOT/engine/src/.gn" ]; then
# The realm on CI is passed in. # The realm on CI is passed in.
if [ -n "${FLUTTER_REALM}" ]; then if [ -n "${FLUTTER_REALM}" ]; then
echo $FLUTTER_REALM > "$FLUTTER_ROOT/bin/internal/engine.realm" echo $FLUTTER_REALM > "$FLUTTER_ROOT/bin/internal/engine.realm"
ENGINE_REALM="$FLUTTER_REALM"
else
if [ -f "$FLUTTER_ROOT/bin/internal/engine.realm" ]; then
ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]')
fi
fi fi
else
# Release branch - these files will exist
ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/engine.version")
ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]')
fi fi
else
# Non-fusion repository - these files will exist
ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/engine.version")
ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]')
fi fi
ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/engine.version")
ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]')
if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; then if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; then
command -v curl > /dev/null 2>&1 || { command -v curl > /dev/null 2>&1 || {