Skip to content

Commit 4d2cb3e

Browse files
authored
fix meson tests for macOS CI (#1260)
1 parent 26536e4 commit 4d2cb3e

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

examples/third_party/BUILD.bazel

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ test_suite(
8686
"//cares:test_c_ares",
8787
"//cares:test_c_ares_ios",
8888
"//curl:curl_test_suite",
89-
# Fails due to linker error in ffi (https://github.com/mesonbuild/meson/issues/12282)
90-
# "//glib:glib_build_test",
89+
"//glib:glib_build_test",
9190
"//gn:gn_launch_test",
9291
"//gperftools:test",
9392
"//iconv:iconv_macos_build_test",
@@ -96,8 +95,7 @@ test_suite(
9695
"//libpng:test_libpng",
9796
"//libssh2:libssh2_build_test",
9897
"//log4cxx:log4cxx_build_test",
99-
# Fails due to linker argument error (https://github.com/mesonbuild/meson/issues/12282)
100-
# "//mesa:mesa_build_test",
98+
"//mesa:mesa_build_test",
10199
"//openssl:openssl_test_suite",
102100
"//pcre:pcre_build_test",
103101
"//python:python_tests",

examples/third_party/glib/glib_repositories.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ def glib_repositories():
88
http_archive,
99
name = "glib",
1010
build_file = Label("//glib:BUILD.glib.bazel"),
11-
strip_prefix = "glib-2.75.0",
12-
sha256 = "6dde8e55cc4a2c83d96797120b08bcffb5f645b2e212164ae22d63c40e0e6360",
13-
url = "https://download.gnome.org/sources/glib/2.75/glib-2.75.0.tar.xz",
11+
strip_prefix = "glib-2.77.0",
12+
sha256 = "1897fd8ad4ebb523c32fabe7508c3b0b039c089661ae1e7917df0956a320ac4d",
13+
url = "https://download.gnome.org/sources/glib/2.77/glib-2.77.0.tar.xz",
1414
)
1515
maybe(
1616
http_archive,

foreign_cc/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def rules_foreign_cc_dependencies(
1212
cmake_version = "3.23.2",
1313
make_version = "4.4.1",
1414
ninja_version = "1.12.1",
15-
meson_version = "1.1.1",
15+
meson_version = "1.5.1",
1616
pkgconfig_version = "0.29.2",
1717
register_preinstalled_tools = True,
1818
register_built_tools = True,

toolchains/built_toolchains.bzl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,19 @@ def _meson_toolchain(version, register_toolchains):
208208
native.register_toolchains(
209209
"@rules_foreign_cc//toolchains:built_meson_toolchain",
210210
)
211+
if version == "1.5.1":
212+
maybe(
213+
http_archive,
214+
name = "meson_src",
215+
build_file_content = _MESON_BUILD_FILE_CONTENT,
216+
sha256 = "567e533adf255de73a2de35049b99923caf872a455af9ce03e01077e0d384bed",
217+
strip_prefix = "meson-1.5.1",
218+
urls = [
219+
"https://mirror.bazel.build/github.com/mesonbuild/meson/releases/download/1.5.1/meson-1.5.1.tar.gz",
220+
"https://github.com/mesonbuild/meson/releases/download/1.5.1/meson-1.5.1.tar.gz",
221+
],
222+
)
223+
return
211224
if version == "1.1.1":
212225
maybe(
213226
http_archive,

0 commit comments

Comments
 (0)