Skip to content

chore(scripts): reuse java-version #4696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 1, 2025
Merged

chore(scripts): reuse java-version #4696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbdc14e
chore(scripts): reuse java-version
millotp Apr 1, 2025
70e7d48
symlink
millotp Apr 1, 2025
a7a3d50
revert
millotp Apr 1, 2025
f9e4d01
other
millotp Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clients/algoliasearch-client-java/.java-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21.0.6+7.0.LTS
21.0.6
1 change: 0 additions & 1 deletion config/.java-version
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions config/.java-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../clients/algoliasearch-client-java/.java-version
8 changes: 2 additions & 6 deletions scripts/ci/githubActions/createMatrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { createClientName, exists, GENERATORS, LANGUAGES, toAbsolutePath } from
import { getClientsConfigField, getLanguageFolder, getTestExtension, getTestOutputFolder } from '../../config.ts';

import type { ClientMatrix, CreateMatrix, ToRunMatrix } from './types.ts';
import { COMMON_DEPENDENCIES, DEPENDENCIES, isBaseChanged } from './utils.ts';
import { COMMON_DEPENDENCIES, DEPENDENCIES, getVersionFileForLanguage, isBaseChanged } from './utils.ts';

// This empty matrix is required by the CI, otherwise it throws
const EMPTY_MATRIX = { client: ['no-run'] };
Expand Down Expand Up @@ -66,11 +66,7 @@ async function createClientMatrix(baseBranch: string): Promise<void> {

const testsRootFolder = `tests/output/${language}`;
const testsOutputBase = `${testsRootFolder}/${getTestOutputFolder(language)}`;
const versionFile = toAbsolutePath(
language === 'javascript'
? '.nvmrc'
: `config/.${language === 'kotlin' || language === 'scala' ? 'java' : language}-version`,
);
const versionFile = toAbsolutePath(getVersionFileForLanguage(language));
let version: string | undefined = undefined;
if (await exists(versionFile)) {
version = (await fsp.readFile(versionFile)).toString();
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/githubActions/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const DEPENDENCIES = {
WEBSITE_CHANGED: ['website', 'scripts/website', 'package.json', 'netlify.toml'],
};

function getVersionFileForLanguage(lang: Language): string {
export function getVersionFileForLanguage(lang: Language): string {
// js rely on the nvmrc of the repo
if (lang === 'javascript') {
return '.nvmrc';
Expand Down