Skip to content

Revert RUBY_MAJOR refactoring for 3.0 #447

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.

Sign up for GitHub

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

Merged
tianon merged 1 commit into from
Apr 23, 2024
Merged

Revert RUBY_MAJOR refactoring for 3.0 #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 3.0/alpine3.16/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 3.0/bullseye/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 3.0/buster/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 3.0/slim-bullseye/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 3.0/slim-buster/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ RUN set -eux; \
} >> /usr/local/etc/gemrc

ENV LANG C.UTF-8
{{ if .version | . == "3.0.6" or . == "3.1.4" or . == "3.2.2" then ( -}}
Copy link

@mfittko mfittko Apr 25, 2024

Choose a reason for hiding this comment

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

@tianon This made our RUBY_MAJOR env var we're relying on in our Dockerfile vanish. We're using this env var for setting the BUNDLE_BIN_PATH (e.g. vendor/bundle/ruby/3.1.0/...). So we were using ruby 3.1.4 and now with 3.1.5, the BUNDLE_BIN_PATH became vendor/bundle/ruby/.0. Sure, I can workaround this, but the change seems wrong and it might affect others!

Copy link

@mfittko mfittko Apr 25, 2024

Choose a reason for hiding this comment

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

the implementation is a bit weird anyway, we thought RUBY_MAJOR (that is 3.0, 3.1, 3.2. 3.3 ...) has some kind of significance in any RUBY_VERSION (e.g. 3.1.4 or 3.1.5)

Copy link
Member Author

@tianon tianon Apr 25, 2024

Choose a reason for hiding this comment

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

Sorry for the breakage, but it is a variable we never intended to expose (and with a name that isn't really accurate for what it is).

Copy link

@mfittko mfittko Apr 25, 2024

Choose a reason for hiding this comment

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

didn't know and who else might not know it. we're deploying a fix right now. thanks


# https://www.ruby-lang.org/{{ .post | ltrimstr("/") }}
{{ if env.version == "3.0" then ( -}}
ENV RUBY_MAJOR {{ env.version }}
ENV RUBY_VERSION {{ .version }}
ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }}
{{ ) else ( -}}

# https://www.ruby-lang.org/{{ .post | ltrimstr("/") }}
ENV RUBY_VERSION {{ .version }}
ENV RUBY_DOWNLOAD_URL {{ .url.xz }}
ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }}
Expand Down Expand Up @@ -203,7 +203,7 @@ RUN set -eux; \
fi; \
{{ ) else "" end -}}
\
{{ if .version | . == "3.0.6" or . == "3.1.4" or . == "3.2.2" then ( -}}
{{ if env.version == "3.0" then ( -}}
{{ if .url.xz != "https://cache.ruby-lang.org/pub/ruby/\(env.version | rtrimstr("-rc"))/ruby-\(.version).tar.xz" then error("url for \(.version) is not as expected!") else "" end -}}
wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
{{ ) else ( -}}
Expand Down