Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow changing RUBY_PATCHLEVEL_STR if RUBY_PATCHLEVEL == -1 #8578

Merged
merged 2 commits into from Oct 3, 2023

Conversation

k0kubun
Copy link
Member

@k0kubun k0kubun commented Oct 2, 2023

One of Shopify's services uses Ruby 3.3.0-preview2. So we use ruby ">= 3.3.0.preview2" in Gemfile. We also want to deploy Ruby master (newer than preview2) to a few instances of that service, but 3.3.0.dev does not satisfy >= 3.3.0.preview2.

I want to keep using >= 3.3.0.preview2 instead of relaxing it to >= 3.3.0.dev since I want to use ruby ">= 3.3.0.preview3" when I bump it again. To allow installing Ruby master while keeping ruby ">= 3.3.0.preview2", I'd like to change RUBY_PATCHLEVEL_STR to something >= preview2, e.g. cppflags=-DRUBY_PATCHLEVEL_STR=pshopify1.

if RUBY_PATCHLEVEL == -1
@k0kubun k0kubun requested review from nobu and byroot October 2, 2023 17:41
Copy link
Member

@byroot byroot left a comment

Choose a reason for hiding this comment

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

If there is no objections from other committers I would really like this feature.

@nobu
Copy link
Member

nobu commented Oct 3, 2023

I want to keep using >= 3.3.0.preview2 instead of relaxing it to >= 3.3.0.dev since I want to use ruby ">= 3.3.0.preview3" when I bump it again. To allow installing Ruby master while keeping ruby ">= 3.3.0.preview2", I'd like to change RUBY_PATCHLEVEL_STR to something >= preview2, e.g. cppflags=-DRUBY_PATCHLEVEL_STR=pshopify1.

I suspect you'll need quotes, cppflags=-DRUBY_PATCHLEVEL_STR='"pshopify1"'.

version.h Outdated Show resolved Hide resolved
Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org>
@k0kubun k0kubun merged commit 68df437 into ruby:master Oct 3, 2023
92 checks passed
@k0kubun k0kubun deleted the patchlevel-str branch October 3, 2023 16:19
sorah added a commit to sorah/ruby that referenced this pull request Nov 12, 2023
the regexp to replace RUBY_PATCHLEVEL_STR for prerelease snapshots doesn't
match since rubyGH-8578.

follow-up: ruby#8578
follow-up: 68df437
nobu pushed a commit that referenced this pull request Nov 13, 2023
the regexp to replace RUBY_PATCHLEVEL_STR for prerelease snapshots doesn't
match since GH-8578.

follow-up: #8578
follow-up: 68df437
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants