Skip to content

Commit

Permalink
Update skia version to m122 (#46)
Browse files Browse the repository at this point in the history
* Update skia version to m122

* Try windows-2022 on github action

* test github action only windows

* test github action only windows

* test windows with fix in skia 1ac04ef

* revert test changes

* we need to use windows-2022 agent because it provides newer python

* update android ndk to r25c to fix broken android debug build

* update m122 commit to 6726cd3
  • Loading branch information
eymar authored Feb 9, 2024
1 parent 55871b6 commit ff44a5f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
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
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
```

0 comments on commit ff44a5f

Please sign in to comment.