Skip to content

Commit 88f1069

Browse files
committed
Unify PGO casing and skip LLVM on Skia cache hit
- Quote pgo matrix values in CI so "True" isn't coerced to a YAML boolean - Move Install LLVM after cache restore so it only runs on cache miss - Match Taskfile PGO default and FLAVOR comparison to CI's "True"
1 parent b65ffe7 commit 88f1069

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
- arch: x64
2222
rid: win-x64
2323
hostlibs_flavor: default
24-
pgo: True
24+
pgo: "True"
2525
- arch: arm64
2626
rid: win-arm64
2727
hostlibs_flavor: default
28-
pgo: True
28+
pgo: "True"
2929

3030
steps:
3131
- name: Checkout repository
@@ -100,16 +100,17 @@ jobs:
100100
fetch-depth: 1
101101
submodules: false
102102

103-
- name: Install LLVM
104-
uses: ./.github/actions/install-llvm
105-
106103
- name: Restore SkiaSharp cache
107104
id: cache_skia
108105
uses: actions/cache@v5
109106
with:
110107
path: artifacts\skiasharp
111108
key: skiasharp-windows-${{ matrix.rid }}-${{ hashFiles('native/skiasharp/**', 'scripts/libHarfBuzzSharp.vcxproj.in') }}
112109

110+
- name: Install LLVM
111+
if: steps.cache_skia.outputs.cache-hit != 'true'
112+
uses: ./.github/actions/install-llvm
113+
113114
- name: Install Task
114115
if: steps.cache_skia.outputs.cache-hit != 'true'
115116
uses: ./.github/actions/install-task

Taskfile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tasks:
2020
desc: Build and deploy HostLibs static libraries (ARCH=x64|arm64, PGO=true|false, SYSROOT=…)
2121
vars:
2222
ARCH: '{{.ARCH | default "x64"}}'
23-
PGO: '{{.PGO | default "true"}}'
23+
PGO: '{{.PGO | default "True"}}'
2424
SYSROOT: '{{.SYSROOT | default ""}}'
2525
cmds:
2626
- task: _hostlibs-windows
@@ -34,7 +34,7 @@ tasks:
3434
internal: true
3535
platforms: [windows]
3636
vars:
37-
FLAVOR: '{{if eq .PGO "true"}}default{{else}}no-pgo{{end}}'
37+
FLAVOR: '{{if eq .PGO "True"}}default{{else}}no-pgo{{end}}'
3838
cmds:
3939
- python -m pip install --disable-pip-version-check -r native/hostlibs/requirements.txt
4040
- conan export native/hostlibs

0 commit comments

Comments
 (0)