From f64efe718e41fbff20d8ee60999325ccfcfb43a5 Mon Sep 17 00:00:00 2001 From: "Oleksandr.Karpovich" Date: Thu, 1 Aug 2024 11:00:06 +0200 Subject: [PATCH 1/2] Update skia to m126-1d69d9b-1 --- .github/workflows/build.yml | 2 +- README.md | 8 ++++---- script/build.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a44b90..341c345 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ on: default: 'false' env: - version: m116-47d3027-1 + version: m126-1d69d9b-1 jobs: macos: diff --git a/README.md b/README.md index ce15e42..e3c2e3a 100644 --- a/README.md +++ b/README.md @@ -16,15 +16,15 @@ Prebuilt binaries can be found [in releases](https://github.com/JetBrains/skia-p ## Building locally ```sh -python3 script/checkout.py --version m116-47d3027-1 +python3 script/checkout.py --version m126-1d69d9b-1 python3 script/build.py -python3 script/archive.py --version m116-47d3027-1 +python3 script/archive.py --version m126-1d69d9b-1 ``` To build a debug build: ```sh -python3 script/checkout.py --version m116-47d3027-1 +python3 script/checkout.py --version m126-1d69d9b-1 python3 script/build.py --build-type Debug -python3 script/archive.py --version m116-47d3027-1 --build-type Debug +python3 script/archive.py --version m126-1d69d9b-1 --build-type Debug ``` diff --git a/script/build.py b/script/build.py index 87e5854..1687a42 100755 --- a/script/build.py +++ b/script/build.py @@ -112,7 +112,7 @@ def main(): 'skia_enable_tools=false', 'skia_enable_fontmgr_custom_directory=false', 'skia_enable_fontmgr_custom_embedded=true', - 'skia_enable_fontmgr_custom_empty=false', + 'skia_enable_fontmgr_custom_empty=true', 'skia_use_webgl=true', 'skia_gl_standard="webgl"', 'skia_use_gl=true', From 9b5c43ac4d0d2f7634ae28ead20cdffa59d1b07f Mon Sep 17 00:00:00 2001 From: "Oleksandr.Karpovich" Date: Thu, 1 Aug 2024 17:11:21 +0200 Subject: [PATCH 2/2] Update macos runner to macos-13 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 341c345..bced813 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ env: jobs: macos: - runs-on: ${{ fromJson('{"macos":"macos-11","ios":"macos-11","iosSim":"macos-11","tvos":"macos-13","tvosSim":"macos-13"}')[matrix.target] }} + runs-on: ${{ fromJson('{"macos":"macos-13","ios":"macos-13","iosSim":"macos-13","tvos":"macos-13","tvosSim":"macos-13"}')[matrix.target] }} strategy: matrix: target: ["macos", "ios", "iosSim", "tvos", "tvosSim"]