Skip to content

Commit 45e7e13

Browse files
authored
[ci] Do not disable compile options (#276)
1 parent 5e30b8a commit 45e7e13

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
mode: [debug, release, profile]
2222
include:
2323
- arch: arm
24-
triple: armv7l-tizen-linux-gnueabi
24+
triple: arm-linux-gnueabi
2525
- arch: arm64
26-
triple: aarch64-tizen-linux-gnu
26+
triple: aarch64-linux-gnu
2727
- arch: x86
28-
triple: i586-tizen-linux-gnueabi
28+
triple: i686-linux-gnu
2929
exclude:
3030
- arch: x86
3131
mode: release
@@ -64,12 +64,6 @@ jobs:
6464
run: |
6565
src/flutter/ci/tizen/cache-checksum.sh restore src/out/$OUTPUT_NAME
6666
67-
# FIXME: Disable compile options unsupported by the Tizen toolchain.
68-
sed -i 's/"-Wno-non-c-typedef-for-linkage",//g' src/build/config/compiler/BUILD.gn
69-
sed -i 's/"-Wno-psabi",//g' src/build/config/compiler/BUILD.gn
70-
sed -i 's/"-Wno-unused-but-set-parameter",//g' src/build/config/compiler/BUILD.gn
71-
sed -i 's/"-Wno-unused-but-set-variable",//g' src/build/config/compiler/BUILD.gn
72-
7367
src/flutter/tools/gn \
7468
--target-os linux --linux-cpu ${{ matrix.arch }} \
7569
--no-goma \

azure-pipelines.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@ jobs:
1414
tizen-arm-release:
1515
arch: arm
1616
mode: release
17-
targetTriple: armv7l-tizen-linux-gnueabi
17+
targetTriple: arm-linux-gnueabi
1818
tizen-arm-profile:
1919
arch: arm
2020
mode: profile
21-
targetTriple: armv7l-tizen-linux-gnueabi
21+
targetTriple: arm-linux-gnueabi
2222
tizen-arm-debug:
2323
arch: arm
2424
mode: debug
25-
targetTriple: armv7l-tizen-linux-gnueabi
25+
targetTriple: arm-linux-gnueabi
2626
tizen-arm64-release:
2727
arch: arm64
2828
mode: release
29-
targetTriple: aarch64-tizen-linux-gnu
29+
targetTriple: aarch64-linux-gnu
3030
tizen-arm64-profile:
3131
arch: arm64
3232
mode: profile
33-
targetTriple: aarch64-tizen-linux-gnu
33+
targetTriple: aarch64-linux-gnu
3434
tizen-arm64-debug:
3535
arch: arm64
3636
mode: debug
37-
targetTriple: aarch64-tizen-linux-gnu
37+
targetTriple: aarch64-linux-gnu
3838
tizen-x86-debug:
3939
arch: x86
4040
mode: debug
41-
targetTriple: i586-tizen-linux-gnueabi
41+
targetTriple: i686-linux-gnu
4242
pool:
4343
name: Default
4444
demands: agent.os -equals Linux
@@ -49,11 +49,7 @@ jobs:
4949
path: src/flutter
5050
- bash: |
5151
gclient sync -f -D
52-
sed -i 's/"-Wno-non-c-typedef-for-linkage",//g' build/config/compiler/BUILD.gn
53-
sed -i 's/"-Wno-psabi",//g' build/config/compiler/BUILD.gn
54-
sed -i 's/"-Wno-unused-but-set-parameter",//g' build/config/compiler/BUILD.gn
55-
sed -i 's/"-Wno-unused-but-set-variable",//g' build/config/compiler/BUILD.gn
56-
displayName: Disable build flags
52+
displayName: Run gclient sync
5753
workingDirectory: $(Pipeline.Workspace)/src
5854
- bash: |
5955
flutter/tools/gn \

0 commit comments

Comments
 (0)