mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-03 09:39:38 +00:00
also install Java-17, bind to JAVA17_HOME in release workflow and use for Gradle
This commit is contained in:
1 parent
370f233a75
commit
e7237609e5
2 files changed
+10
-3
No files matched your search
@@ -79,6 +79,12 @@ jobs:
|
||||
distribution: 'temurin' # See 'Supported distributions' for available options
|
||||
java-version: '8'
|
||||
mvn-toolchain-id: 'JavaSE-1.8'
|
||||
- name: Install JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: 'temurin' # See 'Supported distributions' for available options
|
||||
java-version: '17'
|
||||
mvn-toolchain-id: 'JavaSE-17'
|
||||
- name: Install JDK 25
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
@@ -108,6 +114,7 @@ jobs:
|
||||
GOOGLE_MAPS_AUTHENTICATION_PARAMS: ${{ secrets.GOOGLE_MAPS_AUTHENTICATION_PARAMS }}
|
||||
APP_PARAMETERS: "-Daws.region=eu-west-1"
|
||||
JAVA8_HOME: ${{env.JAVA_HOME_8_X64}}
|
||||
JAVA17_HOME: ${{env.JAVA_HOME_17_X64}}
|
||||
run: |
|
||||
./configuration/buildAndUpdateProduct.sh -x ${{ github.event.inputs.runner_cpus == '' && '4' || github.event.inputs.runner_cpus }} ${{ github.event.inputs.skip_tests == 'true' && '-t' || '' }} ${{ github.event.inputs.local_target_platform == 'true' && '-v' || '' }} build 2>&1
|
||||
- name: show disk stats
|
||||
|
||||
@@ -235,7 +235,7 @@ fi
|
||||
rm $START_DIR/build.log
|
||||
|
||||
if [[ "$@" == "clean" ]]; then
|
||||
./gradlew clean
|
||||
JAVA_HOME="${JAVA17_HOME}" ./gradlew clean
|
||||
if [[ $? != 0 ]]; then
|
||||
exit 100
|
||||
fi
|
||||
@@ -693,11 +693,11 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
|
||||
# mobile_extra="-P -with-not-android-relevant -P with-mobile"
|
||||
|
||||
echo "Building apps with Gradle..."
|
||||
./gradlew build
|
||||
JAVA_HOME="${JAVA17_HOME}" ./gradlew build
|
||||
if [[ ${PIPESTATUS[0]} != 0 ]]; then
|
||||
exit 100
|
||||
fi
|
||||
./gradlew assemble
|
||||
JAVA_HOME="${JAVA17_HOME}" ./gradlew assemble
|
||||
if [[ ${PIPESTATUS[0]} != 0 ]]; then
|
||||
exit 100
|
||||
fi
|
||||
|
||||
Reference in new issue
Block a user