Github actions - compile with Java 8, generate JavaDoc with Java 21.

This commit is contained in:
Jindřich Petřík
2024-08-27 16:52:11 +02:00
committed by Jindra Petřík
parent 471c4384f6
commit b6b1af4fb3
3 changed files with 23 additions and 6 deletions

View File

@@ -33,11 +33,18 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up JDK 21
uses: actions/setup-java@v3
- name: Set up JDK 8
uses: AdoptOpenJDK/install-jdk@v1
with:
java-version: 21
distribution: temurin
version: '8'
architecture: x64
targets: 'JDK_8;JAVA_HOME'
- name: Set up JDK 21
uses: AdoptOpenJDK/install-jdk@v1
with:
version: '21'
architecture: x64
targets: 'JDK_21'
- name: Set up PHP
run: |
apt update -y -qq

View File

@@ -213,7 +213,7 @@
<echo level="info" message="Setup created in ${exe.file}"/>
</target>
<target name="library" depends="-loadversion,release_lib,release_lib_javadoc,-copy-lib">
<target name="library" depends="-loadversion,release_lib,-copy-lib">
<mkdir dir="${releases.dir}"/>
<copy file="${lib.file}" todir="${releases.dir}" />
<copy file="${lib.javadoc.file}" todir="${releases.dir}" />

View File

@@ -11,7 +11,11 @@ VERSION_PROP_FILE="version.properties"
if [ -z ${GITHUB_ACCESS_TOKEN+x} ]; then
# password not set, just make private release without publishing result
echo "No password set, making private release..."
JAVA_HOME=$JDK_8
ant all
# Javadoc generation is buggy with Java 8, lets generate it with Java 21
JAVA_HOME=$JDK_21
ant javadoc
else
# if tag set
if [ $CICD_REFTYPE = "tag" ]; then
@@ -33,9 +37,15 @@ else
echo "build=0">>$VERSION_PROP_FILE
echo "revision=$CICD_COMMIT">>$VERSION_PROP_FILE
echo "debug=false">>$VERSION_PROP_FILE
JAVA_HOME=$JDK_8
#compile, build, create files
ant new-version
# Javadoc generation is buggy with Java 8, lets generate it with Java 21
JAVA_HOME=$JDK_21
ant release_lib_javadoc
# release standard version based on tag
export DEPLOY_TAG_NAME=$CICD_REFNAME