Skip to content

java 21 #315

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

Closed
baltzell wants to merge 5 commits into from
Closed

java 21 #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
329b3f9
goto 21
baltzell Aug 21, 2024
0b80688
more java versions in POMs
baltzell Aug 26, 2024
a1d4923
container to 21
baltzell Aug 26, 2024
c834f8e
use similar path, reduce checks
baltzell Aug 26, 2024
416c3a3
fix rebase mistake
baltzell May 31, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defaults:
shell: bash

env:
java_version: 17
java_version: 21
java_distribution: zulu
javadoc_version: 24 # newer than `java_version` for better javadoc
groovy_version: 4.x
Expand Down
14 changes: 7 additions & 7 deletions install-clara
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,14 @@ do
esac
done

# Check requested installation path:
# Check installation path:
clara_home="$args"
[ "${#args[@]}" -lt 1 ] && error "Missing PATH argument"
[ "${#args[@]}" -lt 1 ] && error "Missing PATH argument."
[ "${#args[@]}" -gt 1 ] && error "Extra PATH arguments: ${args[@]:1}"
[ -e "$clara_home" ] && error "Installation PATH already exists: $clara_home"
mkdir -p $clara_home || error "Cannot create installation PATH: $clara_home"
clara_home=$(cd $clara_home && pwd) && rmdir $clara_home
echo -e "\nConfigured for a CLARA_HOME installation at:\n\t$clara_home"

# If the user didn't specify a coatjava version, try auto-detect the version:
if [ -z ${coatjava+x} ]
Expand All @@ -109,12 +110,11 @@ then
echo -e "\nUsing local COATJAVA installation:\n\t$coatjava"
elif ! [[ "$coatjava" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)t?$ ]] # must be semver, or semver+"t"
then
echo -e "\n\nWARNING: COATJAVA doesn't look like a local installation nor version number: $coatjava"
echo -e "\nWARNING: COATJAVA doesn't look like a local installation nor version number: $coatjava"
fi

# Do everything inside a new, temporary directory:
[ -w "." ] || error "Current working directory is not writeable: \$PWD=$PWD"
tmp_dir=$(mktemp -d tmp.install-clara.XXXXXX)
tmp_dir=$(mktemp -d $clara_home.tmp.XXXXXX)
[ $? -ne 0 ] && error "Cannot create temporary directory: $tmp_dir"
tmp_dir=$(cd $tmp_dir && pwd)
echo -e "\nCreating temporary build directory:\n\t$tmp_dir"
Expand All @@ -133,15 +133,15 @@ fi
# COATJAVA:
if ! compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
then
echo -e "\nRetrieving COATJAVA version $coatjava ..."
echo -e "\nRetrieving COATJAVA/$coatjava ..."
get https://clasweb.jlab.org/clas12offline/distribution/coatjava/coatjava-$coatjava.tar.gz
coatjava=./coatjava
fi
mkdir -p clara-cre/plugins/clas12/config
cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib* clara-cre/plugins/clas12

# GRAPES:
echo -e "\nRetrieving GRAPES version $grapes ..."
echo -e "\nRetrieving GRAPES/$grapes ..."
get https://clasweb.jlab.org/clas12offline/distribution/grapes/grapes-$grapes.tar.gz
mv grapes-$grapes clara-cre/plugins/grapes

Loading