Skip to content

Commit 8cd7768

Browse files
vladimirsamsonovtonsky
vladimirsamsonov
authored and
tonsky
committed
m119-fcb55886b9
1 parent c855d7f commit 8cd7768

File tree

8 files changed

+51
-40
lines changed

8 files changed

+51
-40
lines changed

‎.github/workflows/build.yml‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ on:
22
push:
33
branches:
44
- master
5+
- 'm*'
56
paths:
67
- ".github/workflows/*"
78
- "script/*"
@@ -14,48 +15,48 @@ on:
1415
default: 'false'
1516

1617
env:
17-
version: m116-d2c211228d
18+
version: m119-fcb55886b9
1819

1920
jobs:
2021
macos:
21-
runs-on: macos-11
22+
runs-on: macos-14
2223
strategy:
2324
matrix:
2425
machine: ["x64", "arm64"]
2526
build_type: [Release, Debug]
2627
fail-fast: false
2728
steps:
28-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
2930
- run: python3 script/check_release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }}
3031
if: ${{ github.event.inputs.skip_release != 'true' }}
3132
env:
32-
API_TOKEN: ${{ secrets.API_TOKEN }}
33+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3334
- uses: abdes/gha-setup-ninja@660f330a40aefa8d11632b3f901e92a4adb33d65
3435
- run: python3 script/checkout.py --version ${{ env.version }}
3536
- run: python3 script/build.py --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }}
3637
- run: python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }}
37-
- uses: actions/upload-artifact@v3
38+
- uses: actions/upload-artifact@v4
3839
with:
3940
name: Skia-${{ env.version }}-macos-${{ matrix.build_type }}-${{ matrix.machine }}.zip
4041
path: '*.zip'
4142
- run: python3 script/release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }}
4243
if: ${{ github.event.inputs.skip_release != 'true' }}
4344
env:
44-
API_TOKEN: ${{ secrets.API_TOKEN }}
45+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4546

4647
linux:
47-
runs-on: ubuntu-20.04
48+
runs-on: ubuntu-22.04
4849
strategy:
4950
matrix:
5051
target_machine: ["x64", "arm64"]
5152
build_type: [Release, Debug]
5253
fail-fast: false
5354
steps:
54-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
5556
- run: python3 script/check_release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.target_machine }}
5657
if: ${{ github.event.inputs.skip_release != 'true' }}
5758
env:
58-
API_TOKEN: ${{ secrets.API_TOKEN }}
59+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5960
- uses: abdes/gha-setup-ninja@660f330a40aefa8d11632b3f901e92a4adb33d65
6061
- run: sudo ./script/prepare_linux.sh
6162
- run: |
@@ -65,42 +66,42 @@ jobs:
6566
- run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/checkout.py --version ${{ env.version }}
6667
- run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/build.py --build-type ${{ matrix.build_type }} --machine ${{ matrix.target_machine }}
6768
- 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 }}
68-
- uses: actions/upload-artifact@v3
69+
- uses: actions/upload-artifact@v4
6970
with:
7071
name: Skia-${{ env.version }}-linux-${{ matrix.build_type }}-${{ matrix.target_machine }}.zip
7172
path: '*.zip'
7273
- run: python3 script/release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.target_machine }}
7374
if: ${{ github.event.inputs.skip_release != 'true' }}
7475
env:
75-
API_TOKEN: ${{ secrets.API_TOKEN }}
76+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7677

7778
android:
7879
if: false
79-
runs-on: ubuntu-20.04
80+
runs-on: ubuntu-22.04
8081
strategy:
8182
matrix:
8283
machine: [arm, arm64, x64, x86]
8384
steps:
84-
- uses: actions/checkout@v3
85+
- uses: actions/checkout@v4
8586
- run: python3 script/check_release.py --version ${{ env.version }} --system android --machine ${{ matrix.machine }}
8687
if: ${{ github.event.inputs.skip_release != 'true' }}
8788
env:
88-
API_TOKEN: ${{ secrets.API_TOKEN }}
89+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8990
- uses: actions/setup-java@v1
9091
with:
9192
java-version: 1.8
9293
- run: sudo ./script/prepare_linux.sh
9394
- run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/checkout.py --version ${{ env.version }} --system android --machine ${{ matrix.machine }}
9495
- 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"
9596
- run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/archive.py --system android --machine ${{ matrix.machine }}
96-
- uses: actions/upload-artifact@v3
97+
- uses: actions/upload-artifact@v4
9798
with:
9899
name: Skia-${{ env.version }}-android-Release-${{ matrix.machine }}.zip
99100
path: '*.zip'
100101
- run: python3 script/release.py --system android --machine ${{ matrix.machine }}
101102
if: ${{ github.event.inputs.skip_release != 'true' }}
102103
env:
103-
API_TOKEN: ${{ secrets.API_TOKEN }}
104+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
104105

105106
windows:
106107
runs-on: windows-latest
@@ -109,12 +110,12 @@ jobs:
109110
build_type: [Release, Debug]
110111
fail-fast: false
111112
steps:
112-
- uses: actions/checkout@v3
113+
- uses: actions/checkout@v4
113114
- shell: bash
114115
run: python3 script/check_release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }}
115116
if: ${{ github.event.inputs.skip_release != 'true' }}
116117
env:
117-
API_TOKEN: ${{ secrets.API_TOKEN }}
118+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
118119
- uses: abdes/gha-setup-ninja@660f330a40aefa8d11632b3f901e92a4adb33d65
119120
- uses: microsoft/setup-msbuild@v1
120121
- uses: ilammy/msvc-dev-cmd@v1
@@ -126,12 +127,12 @@ jobs:
126127
run: python3 script/build.py --build-type ${{ matrix.build_type }}
127128
- shell: bash
128129
run: python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }}
129-
- uses: actions/upload-artifact@v3
130+
- uses: actions/upload-artifact@v4
130131
with:
131132
name: Skia-${{ env.version }}-windows-${{ matrix.build_type }}-x64.zip
132133
path: '*.zip'
133134
- shell: bash
134135
run: python3 script/release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }}
135136
if: ${{ github.event.inputs.skip_release != 'true' }}
136137
env:
137-
API_TOKEN: ${{ secrets.API_TOKEN }}
138+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/skia
2-
/depot_tools
32
*.zip
4-
__pycache__
3+
__pycache__

‎patches/GrD3DUtil.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/src/gpu/ganesh/d3d/GrD3DUtil.h b/src/gpu/ganesh/d3d/GrD3DUtil.h
2+
index a58f6d0480..bc91283829 100644
3+
--- a/src/gpu/ganesh/d3d/GrD3DUtil.h
4+
+++ b/src/gpu/ganesh/d3d/GrD3DUtil.h
5+
@@ -8,6 +8,7 @@
6+
#ifndef GrD3DUtil_DEFINED
7+
#define GrD3DUtil_DEFINED
8+
9+
+#include <string>
10+
#include "include/core/SkImage.h"
11+
#include "include/gpu/GrTypes.h"
12+
#include "include/gpu/d3d/GrD3DTypes.h"

‎patches/warn_SkMatrix.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
2-
index 03140760d6..ec7cd35923 100644
2+
index 96a12f111e..5ffd87e13d 100644
33
--- a/include/core/SkMatrix.h
44
+++ b/include/core/SkMatrix.h
5-
@@ -86,7 +86,7 @@ public:
5+
@@ -93,7 +93,7 @@ public:
66
return m;
77
}
8-
static SkMatrix SK_WARN_UNUSED_RESULT Translate(SkVector t) { return Translate(t.x(), t.y()); }
9-
- static SkMatrix SK_WARN_UNUSED_RESULT Translate(SkIVector t) { return Translate(t.x(), t.y()); }
10-
+ static SkMatrix SK_WARN_UNUSED_RESULT Translate(SkIVector t) { return Translate((SkScalar) t.x(), (SkScalar) t.y()); }
8+
[[nodiscard]] static SkMatrix Translate(SkVector t) { return Translate(t.x(), t.y()); }
9+
- [[nodiscard]] static SkMatrix Translate(SkIVector t) { return Translate(t.x(), t.y()); }
10+
+ [[nodiscard]] static SkMatrix Translate(SkIVector t) { return Translate((SkScalar) t.x(), (SkScalar) t.y()); }
1111

1212
/** Sets SkMatrix to rotate by |deg| about a pivot point at (0, 0).
1313

‎script/build.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def main():
2222
'skia_use_system_libpng=false',
2323
'skia_use_system_libwebp=false',
2424
'skia_use_system_zlib=false',
25-
'skia_use_sfntly=false',
25+
# 'skia_use_sfntly=false',
2626
'skia_use_freetype=true',
2727
# 'skia_use_harfbuzz=true',
2828
'skia_use_system_harfbuzz=false',
@@ -81,8 +81,8 @@ def main():
8181
out = os.path.join('out', build_type + '-' + machine)
8282
gn = 'gn.exe' if 'windows' == system else 'gn'
8383
subprocess.check_call([os.path.join('bin', gn), 'gen', out, '--args=' + ' '.join(args)])
84-
ninja = 'ninja.bat' if 'windows' == system else 'ninja'
85-
subprocess.check_call([os.path.join('..', 'depot_tools', ninja), '-C', out, 'skia', 'modules'])
84+
ninja = 'ninja.exe' if 'windows' == system else 'ninja'
85+
subprocess.check_call([os.path.join('third_party/ninja', ninja), '-C', out, 'skia', 'modules'])
8686

8787
return 0
8888

‎script/checkout.py‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ def main():
88
parser = common.create_parser(True)
99
args = parser.parse_args()
1010

11-
# Clone depot_tools
12-
if not os.path.exists("depot_tools"):
13-
subprocess.check_call(["git", "clone", "https://chromium.googlesource.com/chromium/tools/depot_tools.git", "depot_tools"])
14-
1511
# Clone Skia
1612
match = re.match('(m\\d+)(?:-([0-9a-f]+)(?:-([1-9][0-9]*))?)?', args.version)
1713
if not match:
@@ -48,12 +44,13 @@ def main():
4844
subprocess.check_call(["git", "apply", str(x)])
4945

5046
# git deps
47+
env = os.environ.copy()
5148
if 'windows' == common.system():
52-
env = os.environ.copy()
5349
env['PYTHONHTTPSVERIFY']='0'
54-
subprocess.check_call(["python3", "tools/git-sync-deps"], env=env)
55-
else:
56-
subprocess.check_call(["python3", "tools/git-sync-deps"])
50+
51+
subprocess.check_call(["python3", "tools/git-sync-deps"], env=env)
52+
subprocess.check_call(["python3", "bin/fetch-gn"], env=env)
53+
subprocess.check_call(["python3", "bin/fetch-ninja"], env=env)
5754

5855
return 0
5956

‎script/common.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ def classifier():
5151
def github_headers():
5252
if os.environ.get('GITHUB_BASIC'):
5353
auth = 'Basic ' + base64.b64encode(os.environ.get('GITHUB_BASIC').encode('utf-8')).decode('utf-8')
54+
elif os.environ.get('GITHUB_TOKEN'):
55+
auth = 'Bearer ' + os.environ.get('GITHUB_TOKEN')
5456
else:
5557
auth = 'token ' + os.environ.get('API_TOKEN')
5658
return {

‎script/prepare_linux.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ apt-get install gcc-9 g++-9 -y
1111
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
1212
update-alternatives --config gcc
1313

14-
apt-get install git python wget -y
15-
apt-get install ninja-build fontconfig libfontconfig1-dev libglu1-mesa-dev curl zip -y
14+
apt-get install git python3 wget -y
15+
apt-get install ninja-build fontconfig libfontconfig1-dev libglu1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev curl zip -y

0 commit comments

Comments
 (0)