Skip to content

Commit d10a593

Browse files
Fix windows script, use env to enable Qodana
1 parent eb47dd5 commit d10a593

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858

5959
qodana:
6060
name: Perform Qodana analysis
61-
if: false # qodana license expired, temporarily disable the analysis
61+
if: ${{ vars.QODANA_ENABLED == 'true' }}
6262
needs: tests
6363
runs-on: ubuntu-latest
6464
permissions:

src/main/resources/customWindowsStartScript.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
4141
@rem Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
4242
set DEFAULT_JVM_OPTS=${defaultJvmOpts}
4343

44-
@rem Find java.exe
45-
if defined JAVA_HOME goto findJavaFromJavaHome
44+
@rem Use bundled JRE when available
45+
if exist "%APP_HOME%/jre/" set JAVA_HOME="%APP_HOME%/jre/"
4646

4747
@rem Find java.exe
4848
if defined JAVA_HOME goto findJavaFromJavaHome

0 commit comments

Comments
 (0)