Skip to content

Commit a2456d0

Browse files
committed
Fix ci and download engine script
1 parent d3dfd7b commit a2456d0

File tree

2 files changed

+16
-27
lines changed

2 files changed

+16
-27
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ jobs:
88

99
strategy:
1010
matrix:
11-
api-version: ['6.0', '6.5']
12-
arch: [arm, arm64, x86]
11+
api-version: ["6.0", "6.5", "8.0", "10.0"]
12+
arch: [arm, arm64, x86, x64]
1313
include:
1414
- arch: arm
1515
triple: arm-linux-gnueabi
1616
- arch: arm64
1717
triple: aarch64-linux-gnu
1818
- arch: x86
1919
triple: i686-linux-gnu
20+
- arch: x64
21+
triple: x86-64-linux-gnu
2022

2123
steps:
2224
- uses: actions/checkout@v4
@@ -43,56 +45,43 @@ jobs:
4345
gclient config --name=src --unmanaged https://github.com/${{ github.repository }}
4446
gclient sync -v --no-history --shallow
4547
46-
- name: Generate Tizen 6.0 sysroot
47-
if: ${{ matrix.api-version == '6.0' }}
48-
run: src/tools/generate_sysroot.py --out src/sysroot-6.0
48+
- name: Generate Tizen ${{ matrix.api-version }} sysroot
49+
run: src/tools/generate_sysroot.py --api-version ${{ matrix.api-version }} --out src/sysroot-${{ matrix.api-version }}
4950

50-
- name: Generate Tizen 6.5 sysroot
51-
if: ${{ matrix.api-version == '6.5' }}
52-
run: src/tools/generate_sysroot.py --api-version 6.5 --out src/sysroot-6.5
53-
54-
- name: Build for Tizen 6.0
55-
if: ${{ matrix.api-version == '6.0' }}
56-
run: |
57-
src/tools/gn \
58-
--target-cpu ${{ matrix.arch }} \
59-
--target-toolchain /usr/lib/llvm-17 \
60-
--target-sysroot src/sysroot-6.0/${{ matrix.arch }} \
61-
--target-dir build
62-
ninja -C src/out/build
63-
64-
- name: Build for Tizen 6.5
65-
if: ${{ matrix.api-version == '6.5' }}
51+
- name: Build for Tizen ${{ matrix.api-version }}
52+
if: ${{ !(matrix.api-version == '6.0' && matrix.arch == 'x64') && !(matrix.api-version == '6.5' && matrix.arch == 'x64') && !(matrix.api-version == '10.0' && matrix.arch == 'x86') }}
6653
run: |
6754
src/tools/gn \
6855
--target-cpu ${{ matrix.arch }} \
6956
--target-toolchain /usr/lib/llvm-17 \
70-
--target-sysroot src/sysroot-6.5/${{ matrix.arch }} \
71-
--api-version 6.5 \
57+
--target-sysroot src/sysroot-${{ matrix.api-version }}/${{ matrix.arch }} \
58+
--api-version ${{ matrix.api-version }} \
7259
--target-dir build
7360
ninja -C src/out/build
7461
7562
- uses: actions/upload-artifact@v4
63+
if: ${{ !(matrix.api-version == '6.0' && matrix.arch == 'x64') && !(matrix.api-version == '6.5' && matrix.arch == 'x64') && !(matrix.api-version == '10.0' && matrix.arch == 'x86') }}
7664
with:
7765
name: tizen-${{ matrix.api-version }}-${{ matrix.arch }}
7866
path: src/out/build/libflutter_tizen*.so
7967
if-no-files-found: error
8068

8169
- uses: actions/upload-artifact@v4
70+
if: ${{ !(matrix.api-version == '6.0' && matrix.arch == 'x64') && !(matrix.api-version == '6.5' && matrix.arch == 'x64') && !(matrix.api-version == '10.0' && matrix.arch == 'x86') }}
8271
with:
8372
name: tizen-${{ matrix.api-version }}-${{ matrix.arch }}_unittests
8473
path: src/out/build/flutter_tizen_unittests
8574
if-no-files-found: error
8675

8776
- uses: actions/upload-artifact@v4
88-
if: ${{ github.event_name == 'push' }}
77+
if: ${{ !(matrix.api-version == '6.0' && matrix.arch == 'x64') && !(matrix.api-version == '6.5' && matrix.arch == 'x64') && !(matrix.api-version == '10.0' && matrix.arch == 'x86') && github.event_name == 'push' }}
8978
with:
9079
name: tizen-${{ matrix.api-version }}-${{ matrix.arch }}_symbols
9180
path: src/out/build/so.unstripped/libflutter_tizen*.so
9281
if-no-files-found: error
9382

9483
- uses: actions/upload-artifact@v4
95-
if: ${{ matrix.arch == 'arm' && matrix.api-version == '6.0' }}
84+
if: ${{ !(matrix.api-version == '6.0' && matrix.arch == 'x64') && !(matrix.api-version == '6.5' && matrix.arch == 'x64') && !(matrix.api-version == '10.0' && matrix.arch == 'x86') && matrix.arch == 'arm' && matrix.api-version == '6.0' }}
9685
with:
9786
name: tizen-common
9887
path: |

tools/download_engine.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def main():
4141
shutil.rmtree(engine_dir)
4242
engine_dir.mkdir()
4343

44-
names = ['tizen-arm-release.zip',
45-
'tizen-arm64-release.zip', 'tizen-x86-debug.zip']
44+
names = ['tizen-arm-release.zip', 'tizen-arm64-release.zip',
45+
'tizen-x86-debug.zip', 'tizen-x64-release.zip']
4646
for filename in names:
4747
arch = filename.split('-')[1]
4848
print('Downloading libflutter_engine.so for {}...'.format(arch))

0 commit comments

Comments
 (0)