Skip to content

GH-50412: [CI][GLib][Ruby] Remove some unnecessary Ubuntu 20.04 cases#50413

Open
raulcd wants to merge 2 commits into
apache:mainfrom
raulcd:GH-50412
Open

GH-50412: [CI][GLib][Ruby] Remove some unnecessary Ubuntu 20.04 cases#50413
raulcd wants to merge 2 commits into
apache:mainfrom
raulcd:GH-50412

Conversation

@raulcd

@raulcd raulcd commented Jul 8, 2026

Copy link
Copy Markdown
Member

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-actions

github-actions Bot commented Jul 8, 2026

Copy link
Copy Markdown

⚠️ GitHub issue #50412 has been automatically assigned in GitHub to PR creator.

Comment thread c_glib/doc/meson.build Outdated
Comment on lines +23 to +25
# 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?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this just as a mark so I can comment. @kou is the Ubuntu 20.04 mention relevant? Should we be able to replace the version management with version.replace now then? I can try :)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! We can use version.replace() here. Could you try the following?

diff --git a/c_glib/doc/meson.build b/c_glib/doc/meson.build
index 82f300aa03..9c92465f1a 100644
--- a/c_glib/doc/meson.build
+++ b/c_glib/doc/meson.build
@@ -20,20 +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.
-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() / '..'

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to be good, @kou do I have to trigger any specific CI job for this or current CI already validates?

@github-actions github-actions Bot added awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review labels Jul 8, 2026
@github-actions github-actions Bot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jul 8, 2026
@raulcd raulcd marked this pull request as ready for review July 8, 2026 15:13
Copilot AI review requested due to automatic review settings July 8, 2026 15:13
@github-actions github-actions Bot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jul 8, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR cleans up remaining Ubuntu 20.04-specific workarounds in Arrow’s CI/build tooling and GLib/Ruby components, aligning the repo with the already-dropped Ubuntu 20.04 support policy (GH-50412).

Changes:

  • Remove a Ruby extension build workaround that stripped -std=c++11 from $CXXFLAGS (previously noted as Ubuntu 20.04-specific).
  • Remove a CI Emscripten build guard that explicitly rejected UBUNTU=20.04.
  • Simplify GI-DocGen version string generation in Meson now that c_glib requires Meson >=0.61.2.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
ruby/red-arrow/ext/arrow/extconf.rb Drops an Ubuntu 20.04-specific C++ flags workaround from the Ruby extension build.
ci/scripts/cpp_build.sh Removes an Ubuntu 20.04 Emscripten build block, consistent with dropping 20.04 support.
c_glib/doc/meson.build Simplifies version formatting using version.replace(...), relying on newer Meson versions already required by c_glib.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants