Skip to content

Commit 55b3cc1

Browse files
committed
Make Anchor version fallback depend on Solana version
1 parent d1061ed commit 55b3cc1

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

utils/renderContext.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,15 @@ export function getRenderContext({
5757
const repositoryUrl = `https://github.com/${inputs.organizationName}/${inputs.targetDirectoryName}`;
5858

5959
// Versions.
60-
const anchorVersion = resolveAnchorVersion(anchorVersionDetected);
6160
const solanaVersion = resolveSolanaVersion(
6261
language,
6362
inputs.solanaVersion,
6463
solanaVersionDetected
6564
);
65+
const anchorVersion = resolveAnchorVersion(
66+
anchorVersionDetected,
67+
solanaVersion
68+
);
6669
const rustVersion = resolveRustVersion(
6770
language,
6871
solanaVersion,

utils/versionAnchor.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import {
55
getVersionFromStdout,
66
ResolvedVersion,
77
Version,
8+
VersionWithoutPatch,
89
} from './versionCore';
910

10-
export const FALLBACK_ANCHOR_VERSION: Version = '0.30.0';
11-
1211
export async function detectAnchorVersion(
1312
language: Language
1413
): Promise<Version> {
@@ -22,10 +21,20 @@ export async function detectAnchorVersion(
2221
}
2322

2423
export function resolveAnchorVersion(
25-
detectedVersion: Version | undefined
24+
detectedVersion: Version | undefined,
25+
solanaVersion: ResolvedVersion
2626
): ResolvedVersion | undefined {
27+
const fallbackVersionMap: Record<VersionWithoutPatch, Version> = {
28+
'1.17': '0.29.0',
29+
'1.18': '0.30.0',
30+
'2.0': '0.30.0',
31+
'2.1': '0.31.0',
32+
'2.2': '0.31.0',
33+
};
34+
const fallbackVersion: Version =
35+
fallbackVersionMap[solanaVersion.withoutPatch] ?? '0.30.0';
2736
const [full, withoutPatch] = getVersionAndVersionWithoutPatch(
28-
detectedVersion ?? FALLBACK_ANCHOR_VERSION
37+
detectedVersion ?? fallbackVersion
2938
);
3039
return { full, withoutPatch, detected: detectedVersion };
3140
}

0 commit comments

Comments
 (0)