Skip to content

Commit

Permalink
Merge branch 'main' into delete-13
Browse files Browse the repository at this point in the history
  • Loading branch information
oxve committed Apr 24, 2024
2 parents 4da88ef + 620f6c9 commit 96f6987
Show file tree
Hide file tree
Showing 148 changed files with 2,500 additions and 634 deletions.
22 changes: 11 additions & 11 deletions .github/config/evergreen-arm-hardfp.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -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.*"
}
]
Expand Down
16 changes: 0 additions & 16 deletions .github/config/evergreen-arm-softfp-no-loader.json

This file was deleted.

18 changes: 14 additions & 4 deletions .github/config/evergreen-arm-softfp.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -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",
Expand All @@ -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"
}
]
Expand Down
22 changes: 11 additions & 11 deletions .github/config/evergreen-arm64.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -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"
}
]
}
22 changes: 11 additions & 11 deletions .github/config/evergreen-x64.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -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"
}
]
}
2 changes: 1 addition & 1 deletion .github/config/linux-clang-3-9.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"docker_service": "build-linux-clang-3-9",
"on_host_test": true,
"on_host_test_shards": ["0", "1", "2", "3"],
"on_host_test_shards": ["0", "1", "2", "3", "wpt"],
"platforms": [
"linux-x64x11-clang-3-9"
],
Expand Down
2 changes: 1 addition & 1 deletion .github/config/linux-gcc-6-3.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"docker_service": "build-linux-gcc",
"on_host_test": true,
"on_host_test_shards": ["0", "1", "2", "3"],
"on_host_test_shards": ["0", "1", "2", "3", "wpt"],
"platforms": [
"linux-x64x11-gcc-6-3"
],
Expand Down
3 changes: 2 additions & 1 deletion .github/config/linux-modular.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"0",
"1",
"2",
"3"
"3",
"wpt"
],
"platforms": [
"linux-x64x11-modular"
Expand Down
16 changes: 8 additions & 8 deletions .github/config/linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -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",
Expand All @@ -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"
}
]
}
12 changes: 11 additions & 1 deletion .github/config/raspi-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
},
"platforms": [
"raspi-2",
"raspi-2-sbversion-15"
"raspi-2-sbversion-15",
"raspi-2-sbversion-16"
],
"includes": [
{
Expand All @@ -32,6 +33,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.*"
}
]
}
Loading

0 comments on commit 96f6987

Please sign in to comment.