Skip to content

Commit 0782ce4

Browse files
committed
Add more entries to Solana version maps
1 parent 91429ff commit 0782ce4

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

utils/versionRust.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ export function resolveRustVersion(
2929
'1.17': '1.75.0',
3030
'1.18': '1.75.0',
3131
'2.0': '1.75.0',
32+
'2.1': '1.79.0',
33+
'2.2': '1.79.0',
3234
};
3335
const fallbackVersion =
34-
solanaToRustMap[solanaVersion.withoutPatch] ?? '1.75.0';
36+
solanaToRustMap[solanaVersion.withoutPatch] ?? '1.79.0';
3537

3638
const version = inputVersion ?? detectedVersion ?? fallbackVersion;
3739
assertIsValidVersion(language, 'Rust', version);
@@ -53,6 +55,8 @@ function warnAboutSolanaRustVersionMismatch(
5355
'1.17': '1.68.0',
5456
'1.18': '1.75.0',
5557
'2.0': '1.75.0',
58+
'2.1': '1.79.0',
59+
'2.2': '1.79.0',
5660
};
5761
const minimumViableRustVersion: Version | undefined =
5862
minimumViableRustVersionPerSolanaVersion[solanaVersion.withoutPatch];

utils/versionSolana.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export function resolveSolanaVersion(
3030
const [full, withoutPatch] = getVersionAndVersionWithoutPatch(version, {
3131
'1.17': '1.17.34',
3232
'1.18': '1.18.18',
33+
'2.1': '2.1.16',
3334
});
3435
return { full, withoutPatch, detected: detectedVersion };
3536
}

0 commit comments

Comments
 (0)