diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf65e1a62b60e..8d9a0dd818eb1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,6 +55,9 @@ jobs: - name: Build run: | + # Ignore unsupported linker option. + sed -i "/-Wl,--undefined-version/d" src/build/config/compiler/BUILD.gn + src/flutter/tools/gn \ --target-os linux \ --linux-cpu ${{ matrix.arch }} \ @@ -96,7 +99,7 @@ jobs: if-no-files-found: error windows-build: - runs-on: windows-2019 + runs-on: windows-latest strategy: matrix: @@ -118,7 +121,7 @@ jobs: run: | Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -Force echo "DEPOT_TOOLS_WIN_TOOLCHAIN=0" >> $Env:GITHUB_ENV - echo "GYP_MSVS_OVERRIDE_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise" >> $Env:GITHUB_ENV + echo "GYP_MSVS_OVERRIDE_PATH=C:\Program Files\Microsoft Visual Studio\2022\Enterprise" >> $Env:GITHUB_ENV echo "WINDOWSSDKDIR=C:\Program Files (x86)\Windows Kits\10" >> $Env:GITHUB_ENV - name: Install depot_tools @@ -129,6 +132,7 @@ jobs: - name: Run gclient sync working-directory: C:\workspace\engine + shell: powershell run: | gclient config --name=src\flutter --unmanaged https://github.com/flutter-tizen/engine gclient setdep --var=download_dart_sdk=False --deps-file=src/flutter/DEPS @@ -152,7 +156,7 @@ jobs: if-no-files-found: error macos-build: - runs-on: macos-11 + runs-on: macos-latest strategy: matrix: diff --git a/common/config.gni b/common/config.gni index 142701b8542ff..0ba498b98961c 100644 --- a/common/config.gni +++ b/common/config.gni @@ -125,6 +125,4 @@ if (flutter_prebuilt_dart_sdk) { # TODO: We can't build the engine artifacts for arm (32-bit) right now; # see https://github.com/flutter/flutter/issues/74322 build_engine_artifacts = - flutter_build_engine_artifacts && - (current_toolchain == host_toolchain || - (is_linux && !is_chromeos && current_cpu != "arm") || is_mac || is_win) + flutter_build_engine_artifacts && current_toolchain == host_toolchain diff --git a/display_list/testing/BUILD.gn b/display_list/testing/BUILD.gn index e1965e8c4ad8f..b4300727b93a5 100644 --- a/display_list/testing/BUILD.gn +++ b/display_list/testing/BUILD.gn @@ -29,7 +29,8 @@ surface_provider_include_software = !is_android && !is_ios # But, since benchmarks do not run on Windows and rendertests only # runs on SW by default, this restriction currently only limits the # ability to manually cross-check OpenGL on Windows for rendertests -surface_provider_include_gl = !is_fuchsia && !is_ios && !is_win && !is_mac +surface_provider_include_gl = + !is_fuchsia && !is_ios && !is_win && !is_mac && !is_linux # TODO (https://github.com/flutter/flutter/issues/107357): # impeller_enable_vulkan currently requires skia to not use VMA, which in turn diff --git a/impeller/geometry/half.h b/impeller/geometry/half.h index ed81e16a110f4..3b574c1597e20 100644 --- a/impeller/geometry/half.h +++ b/impeller/geometry/half.h @@ -16,7 +16,7 @@ #ifdef FML_OS_WIN using InternalHalf = uint16_t; #else -using InternalHalf = _Float16; +using InternalHalf = uint16_t; #endif namespace impeller { diff --git a/shell/config.gni b/shell/config.gni index 3f498d2c044f7..9ad466439ee2e 100644 --- a/shell/config.gni +++ b/shell/config.gni @@ -17,6 +17,6 @@ declare_args() { test_enable_metal = shell_enable_metal # The Vulkan unittests are combined with the GL unittests. - test_enable_vulkan = is_fuchsia || shell_enable_gl + test_enable_vulkan = is_fuchsia test_enable_software = shell_enable_software }