Skip to content

Commit 6afbfca

Browse files
committed
feat: add arch to getInfoFromManifest
1 parent 3e84c35 commit 6afbfca

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/installer.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export async function getNode(
6666
// Try download from internal distribution (popular versions only)
6767
//
6868
try {
69-
info = await getInfoFromManifest(versionSpec, stable, auth);
69+
info = await getInfoFromManifest(versionSpec, stable, auth, osArch);
7070
if (info) {
7171
core.info(`Acquiring ${info.resolvedVersion} from ${info.downloadUrl}`);
7272
downloadPath = await tc.downloadTool(info.downloadUrl, undefined, auth);
@@ -161,7 +161,8 @@ export async function getNode(
161161
async function getInfoFromManifest(
162162
versionSpec: string,
163163
stable: boolean,
164-
auth: string | undefined
164+
auth: string | undefined,
165+
osArch: string = translateArchToDistUrl(os.arch())
165166
): Promise<INodeVersionInfo | null> {
166167
let info: INodeVersionInfo | null = null;
167168
const releases = await tc.getManifestFromRepo(
@@ -170,11 +171,12 @@ async function getInfoFromManifest(
170171
auth,
171172
'main'
172173
);
173-
const rel = await tc.findFromManifest(versionSpec, stable, releases);
174+
const rel = await tc.findFromManifest(versionSpec, stable, releases, osArch);
174175

175176
if (rel && rel.files.length > 0) {
176177
info = <INodeVersionInfo>{};
177178
info.resolvedVersion = rel.version;
179+
info.arch = rel.files[0].arch;
178180
info.downloadUrl = rel.files[0].download_url;
179181
info.fileName = rel.files[0].filename;
180182
}
@@ -221,7 +223,7 @@ async function resolveVersionFromManifest(
221223
osArch: string = translateArchToDistUrl(os.arch())
222224
): Promise<string | undefined> {
223225
try {
224-
const info = await getInfoFromManifest(versionSpec, stable, auth);
226+
const info = await getInfoFromManifest(versionSpec, stable, auth, osArch);
225227
return info?.resolvedVersion;
226228
} catch (err) {
227229
core.info('Unable to resolve version from manifest...');

0 commit comments

Comments
 (0)