Skip to content

Commit

Permalink
Merge branch 'main' into new-sksg
Browse files Browse the repository at this point in the history
  • Loading branch information
wcandillon authored Jan 10, 2025
2 parents 3451c7c + f45d88f commit 28bcb63
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-skia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build SKIA
on: workflow_dispatch
jobs:
build:
runs-on: macos-latest-large
runs-on: macos-latest-xlarge
steps:
- name: checkout
uses: actions/checkout@v3
Expand Down
22 changes: 17 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:
- name: Build example for Android
env:
JAVA_OPTS: "-XX:MaxHeapSize=6g"
JAVA_OPTS: "-XX:MaxHeapSize=16g"
run: |
yarn turbo run build:android --concurrency 1 --force
Expand Down Expand Up @@ -298,8 +298,8 @@ jobs:
path: apps/docs/static/
name: tests-docs-screenshots

build-ios:
runs-on: macos-latest-large
build-test-ios:
runs-on: macos-latest-xlarge
env:
TURBO_CACHE_DIR: .turbo/ios
steps:
Expand Down Expand Up @@ -329,6 +329,18 @@ jobs:
echo "turbo_cache_hit=1" >> $GITHUB_ENV
fi
- name: Install CocoaPods
working-directory: apps/paper/ios
run: pod install

- name: Start Package Manager
working-directory: apps/paper
run: E2E=true yarn start &

- name: Build example for iOS
run: |
yarn turbo run build:ios --concurrency 1 --force
working-directory: apps/paper
run: yarn ios --simulator 'iPhone 16 Pro'

- name: Run e2e tests
working-directory: packages/skia
run: CI=true yarn e2e
2 changes: 1 addition & 1 deletion packages/skia/src/renderer/__tests__/e2e/Text.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe("Text", () => {
},
{ font }
);
expect(result).toEqual([892, 896]);
expect(result).toEqual(surface.OS === "ios" ? [0, 0] : [892, 896]);
});
it("Should calculate chinese text width correctly", async () => {
const font = fonts.NotoSansSCRegular;
Expand Down

0 comments on commit 28bcb63

Please sign in to comment.