Skip to content

Commit 037970f

Browse files
committed
Test
1 parent a21e3f0 commit 037970f

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
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

index.js

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const versionMap = {
5151
};
5252

5353
const env = Object.assign({}, process.env);
54+
delete env.JAVA_HOME;
5455

5556
function run() {
5657
const args = Array.from(arguments);
@@ -247,24 +248,6 @@ const elasticsearchVersion = getVersion();
247248
const cacheDir = path.join(os.homedir(), 'elasticsearch');
248249
const 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-
268251
if (!fs.existsSync(esHome)) {
269252
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'elasticsearch-'));
270253
process.chdir(tmpDir);

0 commit comments

Comments
 (0)