File tree Expand file tree Collapse file tree 2 files changed +2
-19
lines changed
Expand file tree Collapse file tree 2 files changed +2
-19
lines changed Original file line number Diff line number Diff line change 66 strategy :
77 fail-fast : false
88 matrix :
9- os : [macos-26]
9+ os : [ubuntu-24.04, macos-26]
1010 elasticsearch-version : [9]
1111 steps :
1212 - uses : actions/checkout@v5
Original file line number Diff line number Diff line change @@ -51,6 +51,7 @@ const versionMap = {
5151} ;
5252
5353const env = Object . assign ( { } , process . env ) ;
54+ delete env . JAVA_HOME ;
5455
5556function run ( ) {
5657 const args = Array . from ( arguments ) ;
@@ -247,24 +248,6 @@ const elasticsearchVersion = getVersion();
247248const cacheDir = path . join ( os . homedir ( ) , 'elasticsearch' ) ;
248249const esHome = path . join ( cacheDir , elasticsearchVersion ) ;
249250
250- // java compatibility
251- // https://www.elastic.co/support/matrix
252- const majorVersion = parseInt ( elasticsearchVersion . split ( '.' ) [ 0 ] ) ;
253- const javaHome = majorVersion == 7 ? process . env . JAVA_HOME_11_X64 : ( majorVersion == 8 ? process . env . JAVA_HOME_17_X64 : process . env . JAVA_HOME_21_X64 ) ;
254- if ( javaHome ) {
255- if ( majorVersion == 7 ) {
256- env . JAVA_HOME = javaHome ;
257- addToEnv ( `JAVA_HOME=${ javaHome } ` ) ;
258- } else {
259- env . ES_JAVA_HOME = javaHome ;
260- addToEnv ( `ES_JAVA_HOME=${ javaHome } ` ) ;
261- }
262- }
263-
264- if ( majorVersion > 7 ) {
265- delete env . JAVA_HOME ;
266- }
267-
268251if ( ! fs . existsSync ( esHome ) ) {
269252 const tmpDir = fs . mkdtempSync ( path . join ( os . tmpdir ( ) , 'elasticsearch-' ) ) ;
270253 process . chdir ( tmpDir ) ;
You can’t perform that action at this time.
0 commit comments