Merge pull request #53 from JetBrains/ivan.matkov/m126-d2aaacc35d-1

Update skia to m126-d2aaacc35d-1
JetBrains · Sep 17, 2024 · ee07967 · ee07967
2 parents 7079559 + 0a71b95
commit ee07967
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ on:
         default: 'false'
 
 env:
-  version: m126-1d69d9b-2
+  version: m126-d2aaacc35d-1
 
 jobs:
   macos:
@@ -36,7 +36,7 @@ jobs:
       - run: python3 script/checkout.py --version ${{ env.version }}
       - run: python3 script/build.py --build-type ${{ matrix.build_type }} --target ${{ matrix.target }} --machine ${{ matrix.machine }}
       - run: python3 script/archive.py --version ${{ env.version }} --build-type  ${{ matrix.build_type }} --target ${{ matrix.target }} --machine ${{ matrix.machine }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
         with:
           name: Skia-${{ env.version }}-${{ matrix.target }}-${{ matrix.build_type }}-${{ matrix.machine }}.zip
@@ -63,7 +63,7 @@ jobs:
       - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/checkout.py --version ${{ env.version }}
       - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/build.py --build-type ${{ matrix.build_type }}
       - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
         with:
           name: Skia-${{ env.version }}-linux-${{ matrix.build_type }}-x64.zip
@@ -90,7 +90,7 @@ jobs:
       - run: python3 script/checkout.py --version ${{ env.version }}
       - run: python3 script/build.py --target wasm --machine wasm --build-type ${{ matrix.build_type }}
       - run: python3 script/archive.py --version ${{ env.version }} --target wasm --machine wasm --build-type ${{ matrix.build_type }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
         with:
           name: Skia-${{ env.version }}-wasm-${{ matrix.build_type }}-wasm.zip
@@ -122,7 +122,7 @@ jobs:
           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
+      - uses: actions/upload-artifact@v3
         if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
         with:
           name: Skia-${{ env.version }}-android-${{ matrix.build_type }}-${{ matrix.machine }}.zip
@@ -195,7 +195,7 @@ jobs:
               python3 script/checkout.py --version ${build_version}
               python3 script/build.py --build-type ${build_type} --build-type ${build_type}
               echo "Verified build"
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
         with:
             name: Skia-${{ env.version }}-linux-${{ matrix.build_type }}-arm64.zip
@@ -233,7 +233,7 @@ jobs:
         run: python3 script/build.py --build-type ${{ matrix.build_type }} --target windows --machine ${{ matrix.machine }}
       - shell: bash
         run: python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --target windows --machine ${{ matrix.machine }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
         with:
           name: Skia-${{ env.version }}-windows-${{ matrix.build_type }}-${{ matrix.machine }}.zip

diff --git 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 m126-1d69d9b-2
+python3 script/checkout.py --version m126-d2aaacc35d-1
 python3 script/build.py
-python3 script/archive.py --version m126-1d69d9b-2
+python3 script/archive.py --version m126-d2aaacc35d-1
 ```
 
 To build a debug build:
 
 ```sh
-python3 script/checkout.py --version m126-1d69d9b-2
+python3 script/checkout.py --version m126-d2aaacc35d-1
 python3 script/build.py --build-type Debug
-python3 script/archive.py --version m126-1d69d9b-2 --build-type Debug
+python3 script/archive.py --version m126-d2aaacc35d-1 --build-type Debug
 ```