feat: chrome/m105

Brooooooklyn · Aug 1, 2022 · ade8f64 · ade8f64
1 parent 9e66199
commit ade8f64
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 18 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -88,16 +88,16 @@ jobs:
             target: 'aarch64-linux-android'
             downloadTarget: 'aarch64-linux-android'
             build: |
-              export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
-              export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
-              export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++"
-              export AR="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
-              export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
+              export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
+              export CC="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
+              export CXX="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++"
+              export AR="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
+              export PATH="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
               touch /usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/12.0.9/lib/linux/aarch64/libgcc.a
               chmod 777 /usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/12.0.9/lib/linux/aarch64/libgcc.a
               echo "INPUT(-lunwind)" > /usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/12.0.9/lib/linux/aarch64/libgcc.a
               yarn build --target aarch64-linux-android
-              ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip skia.android-arm64.node
+              ${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip skia.android-arm64.node
 
     name: stable - ${{ matrix.settings.target }} - node@16
     runs-on: ${{ matrix.settings.host }}

diff --git a/README-zh.md b/README-zh.md
@@ -1,7 +1,7 @@
 # `skr canvas`
 
 ![CI](https://github.com/Brooooooklyn/canvas/workflows/CI/badge.svg)
-![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm104-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm105-hotpink)
 [![install size](https://packagephobia.com/badge?p=@napi-rs/canvas)](https://packagephobia.com/result?p=@napi-rs/canvas)
 [![Downloads](https://img.shields.io/npm/dm/@napi-rs/canvas.svg?sanitize=true)](https://npmcharts.com/compare/@napi-rs/canvas?minimal=true)
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # `skr canvas`
 
 ![CI](https://github.com/Brooooooklyn/canvas/workflows/CI/badge.svg)
-![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm104-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm105-hotpink)
 [![install size](https://packagephobia.com/badge?p=@napi-rs/canvas)](https://packagephobia.com/result?p=@napi-rs/canvas)
 [![Downloads](https://img.shields.io/npm/dm/@napi-rs/canvas.svg?sanitize=true)](https://npmcharts.com/compare/@napi-rs/canvas?minimal=true)
 

diff --git a/__test__/pathkit.spec.ts b/__test__/pathkit.spec.ts
@@ -170,10 +170,7 @@ test('Convert stroke to path', (t) => {
   )
   path.stroke({ width: 10, miterLimit: 1 }).simplify().asWinding()
 
-  t.is(
-    path.toSVGString(),
-    'M57.6458 39.75L37.2942 4.5Q34.6962 -2.38419e-06 29.5 -2.38419e-06Q24.3038 -2.90573e-06 21.7058 4.5L1.35417 39.75Q-1.2439 44.25 1.35418 48.75Q3.95226 53.25 9.14841 53.25L49.8516 53.25Q55.0478 53.25 57.6458 48.75Q60.2439 44.25 57.6458 39.75ZM29.5 11L48.1195 43.25L10.8805 43.25L29.5 11Z',
-  )
+  t.snapshot(path.toSVGString())
 })
 
 test('Convert stroke to path 2', (t) => {

diff --git a/__test__/pathkit.spec.ts.md b/__test__/pathkit.spec.ts.md
@@ -4,6 +4,12 @@ The actual snapshot is saved in `pathkit.spec.ts.snap`.
 
 Generated by [AVA](https://avajs.dev).
 
+## Convert stroke to path
+
+> Snapshot 1
+
+    'M57.6458 39.75L37.2942 4.5Q34.6962 -2.38419e-06 29.5 -2.38419e-06Q24.3038 -2.90573e-06 21.7058 4.5L1.35417 39.75Q-1.2439 44.25 1.35418 48.75Q3.95226 53.25 9.14841 53.25L49.8516 53.25Q55.0478 53.25 57.6458 48.75Q60.2439 44.25 57.6458 39.75ZM29.5 11L48.1195 43.25L10.8805 43.25L29.5 11Z'
+
 ## Convert stroke to path 2
 
 > Snapshot 1

diff --git a/__test__/pathkit.spec.ts.snap b/__test__/pathkit.spec.ts.snap
diff --git a/build.rs b/build.rs
@@ -96,7 +96,7 @@ fn main() {
       build.target("arm64-apple-macos");
     }
     "aarch64-linux-android" => {
-      let nkd_home = env::var("ANDROID_NDK_HOME").unwrap();
+      let nkd_home = env::var("ANDROID_NDK_LATEST_HOME").unwrap();
       env::set_var(
         "CC",
         format!(

diff --git a/package.json b/package.json
@@ -109,6 +109,10 @@
     "extensions": [
       "ts"
     ],
+    "files": [
+      "__test__/**/*.spec.ts",
+      "scripts/__test__/**/*.spec.ts"
+    ],
     "workerThreads": false,
     "cache": false,
     "timeout": "3m",

diff --git a/scripts/build-skia.js b/scripts/build-skia.js
@@ -193,11 +193,11 @@ switch (TARGET_TRIPLE) {
     )
     break
   case 'aarch64-linux-android':
-    const { ANDROID_NDK_HOME } = process.env
-    if (!ANDROID_NDK_HOME) {
-      throw new TypeError('ANDROID_NDK_HOME must be specified in env variable')
+    const { ANDROID_NDK_LATEST_HOME } = process.env
+    if (!ANDROID_NDK_LATEST_HOME) {
+      throw new TypeError('ANDROID_NDK_LATEST_HOME must be specified in env variable')
     }
-    ExtraSkiaBuildFlag += ` target_cpu="arm64" ndk="${ANDROID_NDK_HOME}"`
+    ExtraSkiaBuildFlag += ` target_cpu="arm64" ndk="${ANDROID_NDK_LATEST_HOME}"`
     break
   case '':
     break

diff --git a/skia b/skia