Skip to content

Commit a99d60c

Browse files
committed
GH-50412: [CI][GLib][Ruby] Remove some unnecessary Ubuntu 20.04 cases
1 parent 39125ba commit a99d60c

3 files changed

Lines changed: 1 addition & 11 deletions

File tree

c_glib/doc/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ gi_docgen_toml_conf = configuration_data()
2222
gi_docgen_toml_conf.set('SOURCE_REFERENCE', source_reference)
2323
# We can't use "version.replace('-SNAPSHOT', '.dev')" here because
2424
# Ubuntu 20.04's Meson is < 0.58.0.
25+
# Is the above comment still relevant?
2526
if version_tag == ''
2627
gi_docgen_version_tag = ''
2728
else

ci/scripts/cpp_build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,6 @@ if [ "${ARROW_USE_MESON:-OFF}" = "ON" ]; then
157157
CC="${ORIGINAL_CC}"
158158
CXX="${ORIGINAL_CXX}"
159159
elif [ "${ARROW_EMSCRIPTEN:-OFF}" = "ON" ]; then
160-
if [ "${UBUNTU}" = "20.04" ]; then
161-
echo "arrow emscripten build is not supported on Ubuntu 20.04, run with UBUNTU=22.04"
162-
exit -1
163-
fi
164160
n_jobs=2 # Emscripten build fails on docker unless this is set really low
165161
source ~/emsdk/emsdk_env.sh
166162
export CMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot

ruby/red-arrow/ext/arrow/extconf.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@
6262
MESSAGE
6363
end
6464

65-
# Old re2.pc (e.g. re2.pc on Ubuntu 20.04) may add -std=c++11. It
66-
# causes a build error because Apache Arrow C++ requires C++17 or
67-
# later.
68-
#
69-
# We can remove this when we drop support for Ubuntu 20.04.
70-
$CXXFLAGS.gsub!("-std=c++11", "")
71-
7265
[
7366
["glib2", "ext/glib2"],
7467
].each do |name, relative_source_dir|

0 commit comments

Comments
 (0)