From 5de5fc955a22e57db97e2c25ba5743137370818e Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Wed, 20 Apr 2022 23:32:59 +0900 Subject: [PATCH 1/2] [ci] Do not disable compile options --- .github/workflows/build.yml | 12 +++--------- azure-pipelines.yml | 21 +++++++-------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fc8de5903f58..6395343241048 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,11 +21,11 @@ jobs: mode: [debug, release, profile] include: - arch: arm - triple: armv7l-tizen-linux-gnueabi + triple: arm-linux-gnueabi - arch: arm64 - triple: aarch64-tizen-linux-gnu + triple: aarch64-linux-gnu - arch: x86 - triple: i586-tizen-linux-gnueabi + triple: i686-linux-gnu exclude: - arch: x86 mode: release @@ -64,12 +64,6 @@ jobs: run: | src/flutter/ci/tizen/cache-checksum.sh restore src/out/$OUTPUT_NAME - # FIXME: Disable compile options unsupported by the Tizen toolchain. - sed -i 's/"-Wno-non-c-typedef-for-linkage",//g' src/build/config/compiler/BUILD.gn - sed -i 's/"-Wno-psabi",//g' src/build/config/compiler/BUILD.gn - sed -i 's/"-Wno-unused-but-set-parameter",//g' src/build/config/compiler/BUILD.gn - sed -i 's/"-Wno-unused-but-set-variable",//g' src/build/config/compiler/BUILD.gn - src/flutter/tools/gn \ --target-os linux --linux-cpu ${{ matrix.arch }} \ --no-goma \ diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 077392620470b..e4a74e56426e1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,31 +14,31 @@ jobs: tizen-arm-release: arch: arm mode: release - targetTriple: armv7l-tizen-linux-gnueabi + targetTriple: arm-linux-gnueabi tizen-arm-profile: arch: arm mode: profile - targetTriple: armv7l-tizen-linux-gnueabi + targetTriple: arm-linux-gnueabi tizen-arm-debug: arch: arm mode: debug - targetTriple: armv7l-tizen-linux-gnueabi + targetTriple: arm-linux-gnueabi tizen-arm64-release: arch: arm64 mode: release - targetTriple: aarch64-tizen-linux-gnu + targetTriple: aarch64-linux-gnu tizen-arm64-profile: arch: arm64 mode: profile - targetTriple: aarch64-tizen-linux-gnu + targetTriple: aarch64-linux-gnu tizen-arm64-debug: arch: arm64 mode: debug - targetTriple: aarch64-tizen-linux-gnu + targetTriple: aarch64-linux-gnu tizen-x86-debug: arch: x86 mode: debug - targetTriple: i586-tizen-linux-gnueabi + targetTriple: i686-linux-gnu pool: name: Default demands: agent.os -equals Linux @@ -49,13 +49,6 @@ jobs: path: src/flutter - bash: | gclient sync -f -D - sed -i 's/"-Wno-non-c-typedef-for-linkage",//g' build/config/compiler/BUILD.gn - sed -i 's/"-Wno-psabi",//g' build/config/compiler/BUILD.gn - sed -i 's/"-Wno-unused-but-set-parameter",//g' build/config/compiler/BUILD.gn - sed -i 's/"-Wno-unused-but-set-variable",//g' build/config/compiler/BUILD.gn - displayName: Disable build flags - workingDirectory: $(Pipeline.Workspace)/src - - bash: | flutter/tools/gn \ --target-os linux \ --linux-cpu $(arch) \ From 2ad169b3005da8468342ef752e0ba1585f6a35e2 Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Mon, 2 May 2022 20:54:14 +0900 Subject: [PATCH 2/2] Ignore gclient sync stderr --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e4a74e56426e1..8bb37c34a2a15 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -49,6 +49,9 @@ jobs: path: src/flutter - bash: | gclient sync -f -D + displayName: Run gclient sync + workingDirectory: $(Pipeline.Workspace)/src + - bash: | flutter/tools/gn \ --target-os linux \ --linux-cpu $(arch) \