Skip to content

Commit

Permalink
Ruby 3.4.1
Browse files Browse the repository at this point in the history
Signed-off-by: Prabhu Subramanian <[email protected]>
  • Loading branch information
prabhu committed Jan 10, 2025
1 parent b0ecab4 commit e40824c
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 9 deletions.
4 changes: 2 additions & 2 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ ARG JAVA_VERSION=23.0.1-tem
ARG SBT_VERSION=1.10.7
ARG MAVEN_VERSION=3.9.9
ARG GRADLE_VERSION=8.11
ARG GO_VERSION=1.23.3
ARG GO_VERSION=1.23.4
ARG NODE_VERSION=23.6.0
ARG PYTHON_VERSION=3.12
ARG RUBY_VERSION=3.4.0
ARG RUBY_VERSION=3.4.1

ENV GOPATH=/opt/app-root/go \
JAVA_VERSION=$JAVA_VERSION \
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile-bun
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG JAVA_VERSION=23.0.1-tem
ARG SBT_VERSION=1.10.7
ARG MAVEN_VERSION=3.9.9
ARG GRADLE_VERSION=8.11
ARG GO_VERSION=1.23.3
ARG GO_VERSION=1.23.4
ARG PYTHON_VERSION=3.12

ENV GOPATH=/opt/app-root/go \
Expand Down
4 changes: 2 additions & 2 deletions ci/Dockerfile-deno
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ ARG JAVA_VERSION=23.0.1-tem
ARG SBT_VERSION=1.10.7
ARG MAVEN_VERSION=3.9.9
ARG GRADLE_VERSION=8.11
ARG GO_VERSION=1.23.3
ARG GO_VERSION=1.23.4
ARG PYTHON_VERSION=3.12
ARG RUBY_VERSION=3.4.0
ARG RUBY_VERSION=3.4.1

ENV GOPATH=/opt/app-root/go \
JAVA_VERSION=$JAVA_VERSION \
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile-ppc64
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL maintainer="cyclonedx" \
ARG SBT_VERSION=1.10.7
ARG MAVEN_VERSION=3.9.9
ARG GRADLE_VERSION=8.11
ARG GO_VERSION=1.23.3
ARG GO_VERSION=1.23.4
ARG PYTHON_VERSION=3.12

ENV GOPATH=/opt/app-root/go \
Expand Down
5 changes: 5 additions & 0 deletions lib/cli/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5299,6 +5299,11 @@ export async function createRubyBom(path, options) {
break;
}
}
if (DEBUG_MODE && atleastOneHit) {
console.log(
"Successfully obtained the module names for some component gems. You can find them under a property named `Namespaces`.",
);
}
// Clean up
if (process.env?.CDXGEN_GEM_HOME?.startsWith(tmpdir())) {
rmSync(process.env.CDXGEN_GEM_HOME, { recursive: true, force: true });
Expand Down
13 changes: 12 additions & 1 deletion lib/helpers/envcontext.js
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,7 @@ export function performBundleInstall(
});
if (result.error || result.status !== 0) {
let pythonWarningShown = false;
let rubyVersionWarningShown = false;
if (result?.stderr?.includes("requires python 2 to be installed")) {
pythonWarningShown = true;
console.log(
Expand Down Expand Up @@ -982,10 +983,17 @@ export function performBundleInstall(
}
return result.status === 0;
}
if (result?.stderr?.includes("Your Ruby version is ")) {
console.log(
"This project requires a specific version of Ruby. The version requirements can be found in the error message below.",
);
rubyVersionWarningShown = true;
}
if (result?.stderr?.includes("requires rubygems version")) {
console.log(
"This project requires a specific version of RubyGems. To do this, the existing version must be uninstalled followed by installing the required version. `sudo gem uninstall rubygems-update -v <existing version>` and then `sudo gem install rubygems-update -v <required version>`.",
);
rubyVersionWarningShown = true;
if (existsSync(gemFileLock)) {
console.log("Run `bundle install` command to troubleshoot the build.");
} else {
Expand Down Expand Up @@ -1016,7 +1024,10 @@ export function performBundleInstall(
console.log(result.stderr);
}
console.log("------------");
if (process.env?.CDXGEN_IN_CONTAINER === "true") {
if (
process.env?.CDXGEN_IN_CONTAINER === "true" &&
!rubyVersionWarningShown
) {
console.log(
"Are there any devel packages that could be included in the cdxgen container image to avoid these errors? Start a discussion thread here: https://github.com/CycloneDX/cdxgen/discussions",
);
Expand Down
2 changes: 1 addition & 1 deletion types/lib/cli/index.d.ts.map

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

2 changes: 1 addition & 1 deletion types/lib/helpers/envcontext.d.ts.map

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

0 comments on commit e40824c

Please sign in to comment.