From cdfb956bb3d1a93c36016f4825e24d33f654a5da Mon Sep 17 00:00:00 2001 From: Oscar Vestlie Date: Fri, 19 Apr 2024 15:49:37 -0700 Subject: [PATCH] Update evergreen build configs for 25.lts Remove version 13, add 16. b/293645066 --- .github/config/evergreen-arm-hardfp.json | 22 +++++++++---------- .../evergreen-arm-softfp-no-loader.json | 16 -------------- .github/config/evergreen-arm-softfp.json | 18 +++++++++++---- .github/config/evergreen-arm64.json | 22 +++++++++---------- .github/config/evergreen-x64.json | 22 +++++++++---------- .github/config/linux.json | 16 +++++++------- .github/config/raspi-2.json | 9 ++++++++ .github/workflows/evergreen.yaml | 9 -------- 8 files changed, 64 insertions(+), 70 deletions(-) delete mode 100644 .github/config/evergreen-arm-softfp-no-loader.json diff --git a/.github/config/evergreen-arm-hardfp.json b/.github/config/evergreen-arm-hardfp.json index 508b8518b5a0..aec8335c4bd3 100644 --- a/.github/config/evergreen-arm-hardfp.json +++ b/.github/config/evergreen-arm-hardfp.json @@ -13,9 +13,9 @@ }, "platforms": [ "evergreen-arm-hardfp", - "evergreen-arm-hardfp-sbversion-15", "evergreen-arm-hardfp-sbversion-14", - "evergreen-arm-hardfp-sbversion-13" + "evergreen-arm-hardfp-sbversion-15", + "evergreen-arm-hardfp-sbversion-16" ], "includes": [ { @@ -28,33 +28,33 @@ "dimension": "release_version=regex:10.*" }, { - "name":"sbversion-15", - "platform":"evergreen-arm-hardfp-sbversion-15", + "name":"sbversion-14", + "platform":"evergreen-arm-hardfp-sbversion-14", "target_platform":"evergreen-arm-hardfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", - "sb_api_version": "15", + "sb_api_version": "14", "dimension": "release_version=regex:10.*" }, { - "name":"sbversion-14", - "platform":"evergreen-arm-hardfp-sbversion-14", + "name":"sbversion-15", + "platform":"evergreen-arm-hardfp-sbversion-15", "target_platform":"evergreen-arm-hardfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", - "sb_api_version": "14", + "sb_api_version": "15", "dimension": "release_version=regex:10.*" }, { - "name":"sbversion-13", - "platform":"evergreen-arm-hardfp-sbversion-13", + "name":"sbversion-16", + "platform":"evergreen-arm-hardfp-sbversion-16", "target_platform":"evergreen-arm-hardfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", - "sb_api_version": "13", + "sb_api_version": "16", "dimension": "release_version=regex:10.*" } ] diff --git a/.github/config/evergreen-arm-softfp-no-loader.json b/.github/config/evergreen-arm-softfp-no-loader.json deleted file mode 100644 index a3ecb52d8748..000000000000 --- a/.github/config/evergreen-arm-softfp-no-loader.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "docker_service": "build-evergreen", - "platforms": [ - "evergreen-arm-softfp-sbversion-13" - ], - "includes": [ - { - "name":"sbversion-13", - "platform":"evergreen-arm-softfp-sbversion-13", - "target_platform":"evergreen-arm-softfp", - "target_cpu":"target_cpu=\\\"arm\\\"", - "extra_gn_arguments":"use_asan=false", - "sb_api_version":"13" - } - ] -} diff --git a/.github/config/evergreen-arm-softfp.json b/.github/config/evergreen-arm-softfp.json index 288fe861e246..27b3b4da89be 100644 --- a/.github/config/evergreen-arm-softfp.json +++ b/.github/config/evergreen-arm-softfp.json @@ -13,8 +13,9 @@ }, "platforms": [ "evergreen-arm-softfp", + "evergreen-arm-softfp-sbversion-14", "evergreen-arm-softfp-sbversion-15", - "evergreen-arm-softfp-sbversion-14" + "evergreen-arm-softfp-sbversion-16" ], "includes": [ { @@ -25,6 +26,15 @@ "extra_gn_arguments":"use_asan=false", "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" }, + { + "name":"sbversion-14", + "platform":"evergreen-arm-softfp-sbversion-14", + "target_platform":"evergreen-arm-softfp", + "target_cpu":"target_cpu=\\\"arm\\\"", + "extra_gn_arguments":"use_asan=false", + "sb_api_version":"14", + "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" + }, { "name":"sbversion-15", "platform":"evergreen-arm-softfp-sbversion-15", @@ -35,12 +45,12 @@ "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" }, { - "name":"sbversion-14", - "platform":"evergreen-arm-softfp-sbversion-14", + "name":"sbversion-16", + "platform":"evergreen-arm-softfp-sbversion-16", "target_platform":"evergreen-arm-softfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"14", + "sb_api_version":"16", "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" } ] diff --git a/.github/config/evergreen-arm64.json b/.github/config/evergreen-arm64.json index 416f70e494bb..0f217ec6d822 100644 --- a/.github/config/evergreen-arm64.json +++ b/.github/config/evergreen-arm64.json @@ -2,9 +2,9 @@ "docker_service": "build-evergreen", "platforms": [ "evergreen-arm64", - "evergreen-arm64-sbversion-15", "evergreen-arm64-sbversion-14", - "evergreen-arm64-sbversion-13" + "evergreen-arm64-sbversion-15", + "evergreen-arm64-sbversion-16" ], "includes": [ { @@ -15,28 +15,28 @@ "extra_gn_arguments":"use_asan=false" }, { - "name":"sbversion-15", - "platform":"evergreen-arm64-sbversion-15", + "name":"sbversion-14", + "platform":"evergreen-arm64-sbversion-14", "target_platform":"evergreen-arm64", "target_cpu":"target_cpu=\\\"arm64\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"15" + "sb_api_version":"14" }, { - "name":"sbversion-14", - "platform":"evergreen-arm64-sbversion-14", + "name":"sbversion-15", + "platform":"evergreen-arm64-sbversion-15", "target_platform":"evergreen-arm64", "target_cpu":"target_cpu=\\\"arm64\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"14" + "sb_api_version":"15" }, { - "name":"sbversion-13", - "platform":"evergreen-arm64-sbversion-13", + "name":"sbversion-16", + "platform":"evergreen-arm64-sbversion-16", "target_platform":"evergreen-arm64", "target_cpu":"target_cpu=\\\"arm64\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"13" + "sb_api_version":"16" } ] } diff --git a/.github/config/evergreen-x64.json b/.github/config/evergreen-x64.json index 4c824f49c5bb..43162e305129 100644 --- a/.github/config/evergreen-x64.json +++ b/.github/config/evergreen-x64.json @@ -5,9 +5,9 @@ "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"], "platforms": [ "evergreen-x64", + "evergreen-x64-sbversion-14", "evergreen-x64-sbversion-15", - "evergreen-x64-sbversion-14", - "evergreen-x64-sbversion-13" + "evergreen-x64-sbversion-16" ], "includes": [ { @@ -18,28 +18,28 @@ "extra_gn_arguments":"use_asan=false" }, { - "name":"sbversion-15", - "platform":"evergreen-x64-sbversion-15", + "name":"sbversion-14", + "platform":"evergreen-x64-sbversion-14", "target_platform":"evergreen-x64", "target_cpu":"target_cpu=\\\"x64\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"15" + "sb_api_version":"14" }, { - "name":"sbversion-14", - "platform":"evergreen-x64-sbversion-14", + "name":"sbversion-15", + "platform":"evergreen-x64-sbversion-15", "target_platform":"evergreen-x64", "target_cpu":"target_cpu=\\\"x64\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"14" + "sb_api_version":"15" }, { - "name":"sbversion-13", - "platform":"evergreen-x64-sbversion-13", + "name":"sbversion-16", + "platform":"evergreen-x64-sbversion-16", "target_platform":"evergreen-x64", "target_cpu":"target_cpu=\\\"x64\\\"", "extra_gn_arguments":"use_asan=false", - "sb_api_version":"13" + "sb_api_version":"16" } ] } diff --git a/.github/config/linux.json b/.github/config/linux.json index 0a3170ec20a4..9f2f61e6560e 100644 --- a/.github/config/linux.json +++ b/.github/config/linux.json @@ -7,9 +7,9 @@ "linux-x64x11", "linux-x64x11-egl", "linux-x64x11-skia", - "linux-x64x11-sbversion-13", "linux-x64x11-sbversion-14", - "linux-x64x11-sbversion-15" + "linux-x64x11-sbversion-15", + "linux-x64x11-sbversion-16" ], "includes": [ { @@ -27,12 +27,6 @@ "platform":"linux-x64x11-skia", "target_platform":"linux-x64x11-skia" }, - { - "name":"sbversion-13", - "platform":"linux-x64x11-sbversion-13", - "target_platform":"linux-x64x11", - "sb_api_version":"13" - }, { "name":"sbversion-14", "platform":"linux-x64x11-sbversion-14", @@ -44,6 +38,12 @@ "platform":"linux-x64x11-sbversion-15", "target_platform":"linux-x64x11", "sb_api_version":"15" + }, + { + "name":"sbversion-16", + "platform":"linux-x64x11-sbversion-16", + "target_platform":"linux-x64x11", + "sb_api_version":"16" } ] } diff --git a/.github/config/raspi-2.json b/.github/config/raspi-2.json index 6690bf2b49c2..1cf6ab8152f5 100644 --- a/.github/config/raspi-2.json +++ b/.github/config/raspi-2.json @@ -32,6 +32,15 @@ "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false", "sb_api_version": "15", "dimension": "release_version=regex:10.*" + }, + { + "name":"sbversion-16", + "platform":"raspi-2-sbversion-16", + "target_platform":"raspi-2", + "target_cpu":"target_cpu=\\\"arm\\\"", + "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false", + "sb_api_version": "16", + "dimension": "release_version=regex:10.*" } ] } diff --git a/.github/workflows/evergreen.yaml b/.github/workflows/evergreen.yaml index 8e60d8ecc743..13005138cfd5 100644 --- a/.github/workflows/evergreen.yaml +++ b/.github/workflows/evergreen.yaml @@ -49,15 +49,6 @@ jobs: platform: evergreen-arm-softfp nightly: ${{ github.event.inputs.nightly }} run_api_leak_detector: true - evergreen-arm-softfp-no-loader: - uses: ./.github/workflows/main.yaml - permissions: - packages: write - pull-requests: write - with: - platform: evergreen-arm-softfp-no-loader - nightly: ${{ github.event.inputs.nightly }} - run_api_leak_detector: true evergreen-arm64: uses: ./.github/workflows/main.yaml permissions: