Fix cached native build reuse
This commit is contained in:
1 parent
b8ccd4acc0
commit
c453e1686f
2 files changed
+2
-1
No files matched your search
@@ -70,6 +70,7 @@ jobs:
|
|||||||
sh -lc '
|
sh -lc '
|
||||||
set -e
|
set -e
|
||||||
apk add --no-cache bash ca-certificates git python3 py3-httplib2 py3-pysocks py3-six clang compiler-rt lld llvm g++ ninja pkgconf fontconfig-dev glib-dev mesa-dev libx11-dev libxcb-dev libxext-dev pciutils-dev linux-headers perl curl tar xz patch gcompat libc6-compat
|
apk add --no-cache bash ca-certificates git python3 py3-httplib2 py3-pysocks py3-six clang compiler-rt lld llvm g++ ninja pkgconf fontconfig-dev glib-dev mesa-dev libx11-dev libxcb-dev libxext-dev pciutils-dev linux-headers perl curl tar xz patch gcompat libc6-compat
|
||||||
|
git config --global --add safe.directory "*"
|
||||||
python3 - <<'"'"'PY'"'"'
|
python3 - <<'"'"'PY'"'"'
|
||||||
import pathlib
|
import pathlib
|
||||||
import httplib2
|
import httplib2
|
||||||
|
|||||||
@@ -360,7 +360,7 @@ function Patch-WinX86SkiaLinker($SkiaDir) {
|
|||||||
|
|
||||||
$linkerPath = Join-Path $SkiaDir "src\c\sk_linker.cpp"
|
$linkerPath = Join-Path $SkiaDir "src\c\sk_linker.cpp"
|
||||||
$text = Get-Content -Path $linkerPath -Raw
|
$text = Get-Content -Path $linkerPath -Raw
|
||||||
$pattern = '(?m)^ skjson::ObjectValue\* a = nullptr;\r?\n auto r = \(\*a\)\["tmp"\]\.getType\(\);$'
|
$pattern = '(?m)^ skjson::ObjectValue\* a = nullptr;\r?\n auto r = \(\*a\)\["tmp"\]\.getType\(\);\r?$'
|
||||||
$patched = [regex]::Replace($text, $pattern, ' int r = 0;')
|
$patched = [regex]::Replace($text, $pattern, ' int r = 0;')
|
||||||
if ($patched -eq $text) {
|
if ($patched -eq $text) {
|
||||||
throw "Unable to patch win-x86 sk_linker JSON keep-alive references."
|
throw "Unable to patch win-x86 sk_linker JSON keep-alive references."
|
||||||
|
|||||||
Reference in new issue
Block a user