CI

Author: tonsky

.github/workflows/build.yml

@@ -14,18 +14,18 @@ on:
         default: 'false'
 
 env:
-  version: m116-d2c211228d
+  version: m142-f4ed99d244
 
 jobs:
   macos:
-    runs-on: macos-11
+    runs-on: macos-14
     strategy:
       matrix:
         machine: ["x64", "arm64"]
         build_type: [Release, Debug]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: python3 script/check_release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }}
         if: ${{ github.event.inputs.skip_release != 'true' }}
         env:
@@ -34,7 +34,7 @@ jobs:
       - run: python3 script/checkout.py --version ${{ env.version }}
       - run: python3 script/build.py --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }}
       - run: python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: Skia-${{ env.version }}-macos-${{ matrix.build_type }}-${{ matrix.machine }}.zip
           path: '*.zip'
@@ -44,14 +44,14 @@ jobs:
           API_TOKEN: ${{ secrets.API_TOKEN }}
 
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         target_machine: ["x64", "arm64"]
         build_type: [Release, Debug]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: python3 script/check_release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.target_machine }}
         if: ${{ github.event.inputs.skip_release != 'true' }}
         env:
@@ -65,7 +65,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 }} --machine ${{ matrix.target_machine }}
       - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.target_machine }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: Skia-${{ env.version }}-linux-${{ matrix.build_type }}-${{ matrix.target_machine }}.zip
           path: '*.zip'
@@ -76,12 +76,12 @@ jobs:
 
   android:
     if: false
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         machine: [arm, arm64, x64, x86]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: python3 script/check_release.py --version ${{ env.version }} --system android --machine ${{ matrix.machine }}
         if: ${{ github.event.inputs.skip_release != 'true' }}
         env:
@@ -93,7 +93,7 @@ jobs:
       - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/checkout.py --version ${{ env.version }} --system android --machine ${{ matrix.machine }}
       - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/build.py --system android --machine ${{ matrix.machine }} --ndk "/usr/local/lib/android/sdk/ndk-bundle"
       - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/archive.py --system android --machine ${{ matrix.machine }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: Skia-${{ env.version }}-android-Release-${{ matrix.machine }}.zip
           path: '*.zip'
@@ -109,7 +109,7 @@ jobs:
         build_type: [Release, Debug]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - shell: bash
         run: python3 script/check_release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }}
         if: ${{ github.event.inputs.skip_release != 'true' }}
@@ -126,7 +126,7 @@ jobs:
         run: python3 script/build.py --build-type ${{ matrix.build_type }}
       - shell: bash
         run: python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: Skia-${{ env.version }}-windows-${{ matrix.build_type }}-x64.zip
           path: '*.zip'

.gitignore

@@ -1,4 +1,3 @@
 /skia
-/depot_tools
 *.zip
-__pycache__
+__pycache__

patches/warn_SkMatrix.patch

@@ -1,13 +1,13 @@
 diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
-index 03140760d6..ec7cd35923 100644
+index 02c873623b..be12953daa 100644
 --- a/include/core/SkMatrix.h
 +++ b/include/core/SkMatrix.h
-@@ -86,7 +86,7 @@ public:
+@@ -96,7 +96,7 @@ public:
          return m;
      }
-     static SkMatrix SK_WARN_UNUSED_RESULT Translate(SkVector t) { return Translate(t.x(), t.y()); }
--    static SkMatrix SK_WARN_UNUSED_RESULT Translate(SkIVector t) { return Translate(t.x(), t.y()); }
-+    static SkMatrix SK_WARN_UNUSED_RESULT Translate(SkIVector t) { return Translate((SkScalar) t.x(), (SkScalar) t.y()); }
- 
-     /** Sets SkMatrix to rotate by |deg| about a pivot point at (0, 0).
- 
+     [[nodiscard]] static SkMatrix Translate(SkVector t) { return Translate(t.x(), t.y()); }
+-    [[nodiscard]] static SkMatrix Translate(SkIVector t) { return Translate(t.x(), t.y()); }
++    [[nodiscard]] static SkMatrix Translate(SkIVector t) { return Translate((SkScalar) t.x(), (SkScalar) t.y()); }
+
+     [[nodiscard]] static SkMatrix ScaleTranslate(float sx, float sy, float tx, float ty);
+

script/build.py

@@ -22,7 +22,7 @@ def main():
     'skia_use_system_libpng=false',
     'skia_use_system_libwebp=false',
     'skia_use_system_zlib=false',
-    'skia_use_sfntly=false',
+    # 'skia_use_sfntly=false',
     'skia_use_freetype=true',
     # 'skia_use_harfbuzz=true',
     'skia_use_system_harfbuzz=false',
@@ -82,7 +82,7 @@ def main():
   gn = 'gn.exe' if 'windows' == system else 'gn'
   subprocess.check_call([os.path.join('bin', gn), 'gen', out, '--args=' + ' '.join(args)])
   ninja = 'ninja.bat' if 'windows' == system else 'ninja'
-  subprocess.check_call([os.path.join('..', 'depot_tools', ninja), '-C', out, 'skia', 'modules'])
+  subprocess.check_call([os.path.join('third_party/ninja', ninja), '-C', out, 'skia', 'modules'])
 
   return 0
 

script/checkout.py

@@ -8,10 +8,6 @@ def main():
   parser = common.create_parser(True)
   args = parser.parse_args()
 
-  # Clone depot_tools
-  if not os.path.exists("depot_tools"):
-    subprocess.check_call(["git", "clone", "https://chromium.googlesource.com/chromium/tools/depot_tools.git", "depot_tools"])
-
   # Clone Skia
   match = re.match('(m\\d+)(?:-([0-9a-f]+)(?:-([1-9][0-9]*))?)?', args.version)
   if not match:
@@ -48,12 +44,13 @@ def main():
     subprocess.check_call(["git", "apply", str(x)])
 
   # git deps
+  env = os.environ.copy()
   if 'windows' == common.system():
-    env = os.environ.copy()
     env['PYTHONHTTPSVERIFY']='0'
-    subprocess.check_call(["python3", "tools/git-sync-deps"], env=env)
-  else:
-    subprocess.check_call(["python3", "tools/git-sync-deps"])
+
+  subprocess.check_call(["python3", "tools/git-sync-deps"], env=env)
+  subprocess.check_call(["python3", "bin/fetch-gn"], env=env)
+  subprocess.check_call(["python3", "bin/fetch-ninja"], env=env)
 
   return 0