Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update skia version to m122 #46

Merged
merged 9 commits into from
Feb 9, 2024
Merged

Update skia version to m122 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6d8d996
Update skia version to m122
eymar Feb 8, 2024
4fddd4b
Try windows-2022 on github action
eymar Feb 8, 2024
4ff7148
test github action only windows
eymar Feb 8, 2024
1e0334f
test github action only windows
eymar Feb 8, 2024
6b59d78
test windows with fix in skia 1ac04ef
eymar Feb 8, 2024
7d9263c
revert test changes
eymar Feb 8, 2024
161cfbd
we need to use windows-2022 agent because it provides newer python
eymar Feb 8, 2024
581b7b2
update android ndk to r25c to fix broken android debug build
eymar Feb 9, 2024
cf31d66
update m122 commit to 6726cd3
eymar Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
default: 'false'

env:
version: m116-51072f3-1
version: m122-6726cd3-1

jobs:
macos:
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
ndk-version: r25c
- run: python3 script/build.py --target android --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }} --ndk ${{ steps.setup-ndk.outputs.ndk-path }}
- run: python3 script/archive.py --version ${{ env.version }} --target android --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }}
- uses: actions/upload-artifact@v2
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

windows:
runs-on: windows-2019
runs-on: windows-2022
strategy:
matrix:
build_type: [Debug, Release]
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-51072f3-1
python3 script/checkout.py --version m122-6726cd3-1
python3 script/build.py
python3 script/archive.py --version m116-51072f3-1
python3 script/archive.py --version m122-6726cd3-1
```

To build a debug build:

```sh
python3 script/checkout.py --version m116-51072f3-1
python3 script/checkout.py --version m122-6726cd3-1
python3 script/build.py --build-type Debug
python3 script/archive.py --version m116-51072f3-1 --build-type Debug
python3 script/archive.py --version m122-6726cd3-1 --build-type Debug
```
Loading