From a99d60c80beecb519553c37ed349de47c24c7ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 8 Jul 2026 10:47:24 +0200 Subject: [PATCH 1/2] GH-50412: [CI][GLib][Ruby] Remove some unnecessary Ubuntu 20.04 cases --- c_glib/doc/meson.build | 1 + ci/scripts/cpp_build.sh | 4 ---- ruby/red-arrow/ext/arrow/extconf.rb | 7 ------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/c_glib/doc/meson.build b/c_glib/doc/meson.build index 82f300aa0363..7d96794e6222 100644 --- a/c_glib/doc/meson.build +++ b/c_glib/doc/meson.build @@ -22,6 +22,7 @@ gi_docgen_toml_conf = configuration_data() gi_docgen_toml_conf.set('SOURCE_REFERENCE', source_reference) # We can't use "version.replace('-SNAPSHOT', '.dev')" here because # Ubuntu 20.04's Meson is < 0.58.0. +# Is the above comment still relevant? if version_tag == '' gi_docgen_version_tag = '' else diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh index 19cfb00c7bec..c02d7894bcae 100755 --- a/ci/scripts/cpp_build.sh +++ b/ci/scripts/cpp_build.sh @@ -157,10 +157,6 @@ if [ "${ARROW_USE_MESON:-OFF}" = "ON" ]; then CC="${ORIGINAL_CC}" CXX="${ORIGINAL_CXX}" elif [ "${ARROW_EMSCRIPTEN:-OFF}" = "ON" ]; then - if [ "${UBUNTU}" = "20.04" ]; then - echo "arrow emscripten build is not supported on Ubuntu 20.04, run with UBUNTU=22.04" - exit -1 - fi n_jobs=2 # Emscripten build fails on docker unless this is set really low source ~/emsdk/emsdk_env.sh export CMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot diff --git a/ruby/red-arrow/ext/arrow/extconf.rb b/ruby/red-arrow/ext/arrow/extconf.rb index 1ec96d95b3e7..bc6e4386de7c 100644 --- a/ruby/red-arrow/ext/arrow/extconf.rb +++ b/ruby/red-arrow/ext/arrow/extconf.rb @@ -62,13 +62,6 @@ MESSAGE end -# Old re2.pc (e.g. re2.pc on Ubuntu 20.04) may add -std=c++11. It -# causes a build error because Apache Arrow C++ requires C++17 or -# later. -# -# We can remove this when we drop support for Ubuntu 20.04. -$CXXFLAGS.gsub!("-std=c++11", "") - [ ["glib2", "ext/glib2"], ].each do |name, relative_source_dir| From e059b4fb8fbeb4b7d3b371be1be47e4c3ff9ace4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 8 Jul 2026 16:05:08 +0200 Subject: [PATCH 2/2] Try Patch proposed by Kou --- c_glib/doc/meson.build | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/c_glib/doc/meson.build b/c_glib/doc/meson.build index 7d96794e6222..9c92465f1a33 100644 --- a/c_glib/doc/meson.build +++ b/c_glib/doc/meson.build @@ -20,21 +20,7 @@ gi_docgen = find_program('gi-docgen') gi_docgen_toml_conf = configuration_data() gi_docgen_toml_conf.set('SOURCE_REFERENCE', source_reference) -# We can't use "version.replace('-SNAPSHOT', '.dev')" here because -# Ubuntu 20.04's Meson is < 0.58.0. -# Is the above comment still relevant? -if version_tag == '' - gi_docgen_version_tag = '' -else - # GI-DocGen doesn't like MAJOR.MINOR.PATCH-SNAPSHOT format. - gi_docgen_version_tag = '.dev' -endif -gi_docgen_version = '@0@.@1@.@2@@3@'.format( - version_major, - version_minor, - version_micro, - gi_docgen_version_tag, -) +gi_docgen_version = version.replace('-SNAPSHOT', '.dev') gi_docgen_toml_conf.set('VERSION', gi_docgen_version) gir_top_build_dir = meson.current_build_dir() / '..'