Skip to content

[OPENJDK-2994] Cleanup: Fail the build if jdeps fails #537

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
merged 3 commits into from
Jan 29, 2025
Merged

[OPENJDK-2994] Cleanup: Fail the build if jdeps fails #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e589a8
Ensure the build fails when jdeps fails
Josh-Matsuoka Jan 20, 2025
b74f064
Merge remote-tracking branch 'upstream2/jlink-dev' into error-handling
Josh-Matsuoka Jan 24, 2025
5f04691
Fix return code handling
Josh-Matsuoka Jan 28, 2025
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
5 changes: 1 addition & 4 deletions modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ function generate_deps() {
--module-path dependencies \
"$JAVA_APP_JAR" \
"$JAVA_LIB_DIR"/**/*.jar \
> deps.txt || {
echo "jdeps failed: return code $?"
exit $?
}
> deps.txt
else
$JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
--module-path dependencies \
Expand Down
22 changes: 17 additions & 5 deletions modules/s2i/bash/artifacts/usr/local/s2i/assemble
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

set -e
set -eo pipefail

source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i"
Expand All @@ -27,18 +27,30 @@ if [ "$S2I_ENABLE_JLINK" = "true" ]; then

source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
echo "Invoking mkdeps"
generate_deps
generate_deps || {
log_error "mkdeps failed, return code: $?"
exit 1
}

source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
echo "Stripping dependencies"
mkstrippeddeps
mkstrippeddeps || {
log_error "stripping dependencies failed, return code: $?"
exit 1
}

source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
echo "Generating JDK dependencies"
generatejdkdeps
generatejdkdeps || {
log_error "generating JDK dependencies failed, return code: $?"
exit 1
}

source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
echo "Linking jre"
generate_jre_image
generate_jre_image || {
log_error "Linking JRE failed, return code: $?"
exit 1
}

fi