Skip to content

Commit a489b44

Browse files
SchahenSchahen
authored
Move to m132
m132 build revisited with most possible fixes for arm
2 parents f9d24e0 + bd0006b commit a489b44

File tree

4 files changed

+32
-29
lines changed

4 files changed

+32
-29
lines changed

Diff for: ‎.github/workflows/build.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
contents: write
1717

1818
env:
19-
version: m126-6fd3120c1b-1
19+
version: m132-9b3c42e2f9-1
2020

2121
jobs:
2222
macos:
@@ -41,7 +41,7 @@ jobs:
4141
- run: python3 script/checkout.py --version ${{ env.version }}
4242
- run: python3 script/build.py --build-type ${{ matrix.build_type }} --target ${{ matrix.target }} --machine ${{ matrix.machine }}
4343
- run: python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --target ${{ matrix.target }} --machine ${{ matrix.machine }}
44-
- uses: actions/upload-artifact@v3
44+
- uses: actions/upload-artifact@v4
4545
if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
4646
with:
4747
name: Skia-${{ env.version }}-${{ matrix.target }}-${{ matrix.build_type }}-${{ matrix.machine }}.zip
@@ -68,7 +68,7 @@ jobs:
6868
- run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/checkout.py --version ${{ env.version }}
6969
- run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/build.py --build-type ${{ matrix.build_type }}
7070
- run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }}
71-
- uses: actions/upload-artifact@v3
71+
- uses: actions/upload-artifact@v4
7272
if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
7373
with:
7474
name: Skia-${{ env.version }}-linux-${{ matrix.build_type }}-x64.zip
@@ -95,7 +95,7 @@ jobs:
9595
- run: python3 script/checkout.py --version ${{ env.version }}
9696
- run: python3 script/build.py --target wasm --machine wasm --build-type ${{ matrix.build_type }}
9797
- run: python3 script/archive.py --version ${{ env.version }} --target wasm --machine wasm --build-type ${{ matrix.build_type }}
98-
- uses: actions/upload-artifact@v3
98+
- uses: actions/upload-artifact@v4
9999
if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
100100
with:
101101
name: Skia-${{ env.version }}-wasm-${{ matrix.build_type }}-wasm.zip
@@ -127,7 +127,7 @@ jobs:
127127
ndk-version: r25c
128128
- run: python3 script/build.py --target android --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }} --ndk ${{ steps.setup-ndk.outputs.ndk-path }}
129129
- run: python3 script/archive.py --version ${{ env.version }} --target android --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }}
130-
- uses: actions/upload-artifact@v3
130+
- uses: actions/upload-artifact@v4
131131
if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
132132
with:
133133
name: Skia-${{ env.version }}-android-${{ matrix.build_type }}-${{ matrix.machine }}.zip
@@ -138,7 +138,7 @@ jobs:
138138
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
139139

140140
linux-arm64:
141-
runs-on: ubuntu-latest
141+
runs-on: ubuntu-22.04
142142
strategy:
143143
matrix:
144144
build_type: [ Debug, Release ]
@@ -151,7 +151,7 @@ jobs:
151151
if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
152152
with:
153153
arch: aarch64
154-
distro: ubuntu20.04
154+
distro: ubuntu22.04
155155
githubToken: ${{ secrets.GITHUB_TOKEN }}
156156
# Mount checkout directory as /checkout in the container
157157
dockerRunArgs: |
@@ -180,7 +180,7 @@ jobs:
180180
if: ${{ github.event.inputs.skip_release == 'true' || github.ref != 'refs/heads/main' }}
181181
with:
182182
arch: aarch64
183-
distro: ubuntu20.04
183+
distro: ubuntu22.04
184184
githubToken: ${{ secrets.GITHUB_TOKEN }}
185185
# Mount checkout directory as /checkout in the container
186186
dockerRunArgs: |
@@ -200,7 +200,7 @@ jobs:
200200
python3 script/checkout.py --version ${build_version}
201201
python3 script/build.py --build-type ${build_type} --build-type ${build_type}
202202
echo "Verified build"
203-
- uses: actions/upload-artifact@v3
203+
- uses: actions/upload-artifact@v4
204204
if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
205205
with:
206206
name: Skia-${{ env.version }}-linux-${{ matrix.build_type }}-arm64.zip
@@ -238,7 +238,7 @@ jobs:
238238
run: python3 script/build.py --build-type ${{ matrix.build_type }} --target windows --machine ${{ matrix.machine }}
239239
- shell: bash
240240
run: python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --target windows --machine ${{ matrix.machine }}
241-
- uses: actions/upload-artifact@v3
241+
- uses: actions/upload-artifact@v4
242242
if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
243243
with:
244244
name: Skia-${{ env.version }}-windows-${{ matrix.build_type }}-${{ matrix.machine }}.zip

Diff for: ‎script/archive.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def main():
4646
'modules/skunicode/src/*.h',
4747
'src/base/*.h',
4848
'src/core/*.h',
49-
'src/gpu/gl/*.h',
49+
'src/gpu/ganesh/gl/*.h',
5050
'src/utils/*.h',
5151
'third_party/externals/angle2/LICENSE',
5252
'third_party/externals/angle2/include/**/*',

Diff for: ‎script/checkout.py

+19-17
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,11 @@
22

33
import common, os, re, subprocess, sys
44

5-
def main():
6-
os.chdir(os.path.join(os.path.dirname(__file__), os.pardir))
7-
8-
parser = common.create_parser(True)
9-
args = parser.parse_args()
10-
11-
# Clone depot_tools
12-
if not os.path.exists("depot_tools"):
13-
subprocess.check_call(["git", "clone", "--config", "core.autocrlf=input", "https://chromium.googlesource.com/chromium/tools/depot_tools.git", "depot_tools"])
14-
5+
def checkout_skia(commit):
156
# Clone Skia
16-
match = re.match('(m\\d+)(?:-([0-9a-f]+)(?:-([1-9][0-9]*))?)?', args.version)
17-
if not match:
18-
raise Exception('Expected --version "m<ver>-<sha>", got "' + args.version + '"')
19-
20-
commit = match.group(2)
21-
iteration = match.group(3)
227

238
if os.path.exists("skia"):
24-
print("> Fetching")
9+
print("> Fetching {}".format(commit))
2510
os.chdir("skia")
2611
subprocess.check_call(["git", "reset", "--hard"])
2712
subprocess.check_call(["git", "clean", "-d", "-f"])
@@ -36,6 +21,23 @@ def main():
3621
print("> Checking out", commit)
3722
subprocess.check_call(["git", "-c", "advice.detachedHead=false", "checkout", commit])
3823

24+
def main():
25+
os.chdir(os.path.join(os.path.dirname(__file__), os.pardir))
26+
27+
parser = common.create_parser(True)
28+
args = parser.parse_args()
29+
30+
# Clone depot_tools
31+
if not os.path.exists("depot_tools"):
32+
subprocess.check_call(["git", "clone", "--config", "core.autocrlf=input", "https://chromium.googlesource.com/chromium/tools/depot_tools.git", "depot_tools"])
33+
34+
match = re.match('(m\\d+)(?:-([0-9a-f]+)(?:-([1-9][0-9]*))?)?', args.version)
35+
if not match:
36+
raise Exception('Expected --version "m<ver>-<sha>", got "' + args.version + '"')
37+
38+
commit = match.group(2)
39+
checkout_skia(commit)
40+
3941
# git deps
4042
print("> Running tools/git-sync-deps")
4143
if 'windows' == common.host():

Diff for: ‎script/prepare_linux_arm.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ export DEBIAN_FRONTEND=noninteractive
66
apt-get update -y
77
apt-get install binutils build-essential -y
88
apt-get install software-properties-common -y
9-
apt-get install python3 git fontconfig libfontconfig1-dev libglu1-mesa-dev curl wget -y
9+
add-apt-repository ppa:git-core/ppa -y
10+
apt-get install python3 git fontconfig libfontconfig1-dev libgl-dev curl wget -y
1011
apt-get install clang -y

0 commit comments

Comments
 (0)