Skip to content

Commit d06b824

Browse files
authored
GH-50412: [CI][GLib][Ruby] Remove some unnecessary Ubuntu 20.04 cases (#50413)
### Rationale for this change We did drop support for Ubuntu 20.04 almost a year ago. We should remove cases that cater for it. ### What changes are included in this PR? Found a couple places where we still seem to be doing some minor fixes for Ubuntu 20.04. Clean those up. ### Are these changes tested? CI has been run ### Are there any user-facing changes? No * GitHub Issue: #50412 Authored-by: Raúl Cumplido <raulcumplido@gmail.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent 463682d commit d06b824

3 files changed

Lines changed: 1 addition & 25 deletions

File tree

c_glib/doc/meson.build

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,7 @@ gi_docgen = find_program('gi-docgen')
2020

2121
gi_docgen_toml_conf = configuration_data()
2222
gi_docgen_toml_conf.set('SOURCE_REFERENCE', source_reference)
23-
# We can't use "version.replace('-SNAPSHOT', '.dev')" here because
24-
# Ubuntu 20.04's Meson is < 0.58.0.
25-
if version_tag == ''
26-
gi_docgen_version_tag = ''
27-
else
28-
# GI-DocGen doesn't like MAJOR.MINOR.PATCH-SNAPSHOT format.
29-
gi_docgen_version_tag = '.dev'
30-
endif
31-
gi_docgen_version = '@0@.@1@.@2@@3@'.format(
32-
version_major,
33-
version_minor,
34-
version_micro,
35-
gi_docgen_version_tag,
36-
)
23+
gi_docgen_version = version.replace('-SNAPSHOT', '.dev')
3724
gi_docgen_toml_conf.set('VERSION', gi_docgen_version)
3825

3926
gir_top_build_dir = meson.current_build_dir() / '..'

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)