Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Cesium
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
Cesium-grp
Cesium
Commits
c614bdd3
Commit
c614bdd3
authored
1 year ago
by
Benoit Lavenier
Browse files
Options
Downloads
Patches
Plain Diff
enh(jvm): Fix error message, when checking JAVA version
parent
274f252e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#35083
failed
1 year ago
Stage: alt_build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/env-global.sh
+6
-4
6 additions, 4 deletions
scripts/env-global.sh
with
6 additions
and
4 deletions
scripts/env-global.sh
+
6
−
4
View file @
c614bdd3
...
...
@@ -74,10 +74,12 @@ if test -d "${JAVA_HOME}"; then
if
test
$?
-ne
0
||
test
-z
"
${
JAVA_VERSION
}
"
;
then
echo
"No Java JRE 1.8 found in machine. This is required for Android artifacts."
else
JAVA_MAJOR_VERSION
=
$(
echo
${
JAVA_VERSION
}
|
awk
'{split($0, array, ".")} END{print array[1]}'
)
JAVA_MINOR_VERSION
=
$(
echo
${
JAVA_VERSION
}
|
awk
'{split($0, array, ".")} END{print array[2]}'
)
if
!
test
"
${
JAVA_MAJOR_VERSION
}
"
-eq
"11"
||
!
test
"
${
JAVA_MINOR_VERSION
}
"
-eq
"0"
;
then
echo
"ERROR: Require a Java SDK in version 11, but found
${
JAVA_VERSION
}
. You can override your default JAVA_HOME in '.local/env.sh'."
if
!
test
"
${
JAVA_VERSION
}
"
-eq
"11"
;
then
JAVA_MAJOR_VERSION
=
$(
echo
${
JAVA_VERSION
}
|
awk
'{split($0, array, ".")} END{print array[1]}'
)
JAVA_MINOR_VERSION
=
$(
echo
${
JAVA_VERSION
}
|
awk
'{split($0, array, ".")} END{print array[2]}'
)
if
!
test
"
${
JAVA_MAJOR_VERSION
}
"
-eq
"11"
||
!
test
"
${
JAVA_MINOR_VERSION
}
"
-eq
"0"
;
then
echo
"ERROR: Require a Java SDK in version 11, but found
${
JAVA_VERSION
}
. You can override your default JAVA_HOME in '.local/env.sh'."
fi
fi
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment