Skip to content
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

[BACKPORT] Add [email protected] support to v1.x release #120

Merged
merged 1 commit into from
Oct 18, 2022
Merged

[BACKPORT] Add [email protected] support to v1.x release #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
volta-version: ["0.9.0","0.8.7","0.7.2","0.6.8"]
volta-version: ["0.9.0","0.8.7","0.7.2","0.6.8", "1.1.0"]
os: [ubuntu, macOS, windows]
exclude:
# this action didn't support windows until at least Volta 0.7
Expand Down
142 changes: 96 additions & 46 deletions src/installer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,78 @@ import { buildLayout, buildDownloadUrl } from './installer';
import { createTempDir } from 'broccoli-test-helper';

describe('buildDownloadUrl', () => {
test('darwin', function () {
expect(buildDownloadUrl('darwin', '0.6.4')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v0.6.4/volta-0.6.4-macos.tar.gz"`
);
});
describe('volta < 1.1.0', function () {
test('darwin - x64', async function () {
expect(await buildDownloadUrl('darwin', 'x64', '0.6.4')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v0.6.4/volta-0.6.4-macos.tar.gz"`
);
});

test('linux', function () {
expect(buildDownloadUrl('linux', '0.6.4')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v0.6.4/volta-0.6.4-linux-openssl-1.1.tar.gz"`
);
});
test('darwin - arm64', async function () {
expect(await buildDownloadUrl('darwin', 'arm64', '0.6.4')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v0.6.4/volta-0.6.4-macos.tar.gz"`
);
});

test('linux', async function () {
expect(await buildDownloadUrl('linux', 'x64', '0.6.4')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v0.6.4/volta-0.6.4-linux-openssl-1.1.tar.gz"`
);
});

test('win32', async function () {
expect(await buildDownloadUrl('win32', 'x86-64', '0.7.2')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v0.7.2/volta-0.7.2-windows-x86_64.msi"`
);
});

test('win32', function () {
expect(buildDownloadUrl('win32', '0.7.2')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v0.7.2/volta-0.7.2-windows-x86_64.msi"`
);
test('aix', async function () {
expect(
async () =>
await buildDownloadUrl('aix', 'hmm, wat?? (I dont know a valid arch for aix)', '0.6.4')
).rejects.toThrowErrorMatchingInlineSnapshot(`"your platform aix is not yet supported"`);
});
});

test('aix', function () {
expect(() => buildDownloadUrl('aix', '0.6.4')).toThrowErrorMatchingInlineSnapshot(
`"your platform aix is not yet supported"`
);
describe('[email protected]', function () {
test('darwin - x64', async function () {
expect(await buildDownloadUrl('darwin', 'x64', '1.1.0')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v1.1.0/volta-1.1.0-macos.tar.gz"`
);
});

test('darwin - arm64', async function () {
expect(await buildDownloadUrl('darwin', 'arm64', '1.1.0')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v1.1.0/volta-1.1.0-macos-aarch64.tar.gz"`
);
});

test('linux', async function () {
expect(await buildDownloadUrl('linux', 'x64', '1.1.0')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v1.1.0/volta-1.1.0-linux.tar.gz"`
);

expect(await buildDownloadUrl('linux', 'x64', '1.1.0')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v1.1.0/volta-1.1.0-linux.tar.gz"`
);

expect(await buildDownloadUrl('linux', 'x64', '1.1.0')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v1.1.0/volta-1.1.0-linux.tar.gz"`
);
});

test('win32', async function () {
expect(await buildDownloadUrl('win32', 'x86-64', '1.1.0')).toMatchInlineSnapshot(
`"https://github.com/volta-cli/volta/releases/download/v1.1.0/volta-1.1.0-windows-x86_64.msi"`
);
});

test('aix', async function () {
expect(
async () =>
await buildDownloadUrl('aix', 'hmm, wat?? (I dont know a valid arch for aix)', '1.1.0')
).rejects.toThrowErrorMatchingInlineSnapshot(`"your platform aix is not yet supported"`);
});
});
});

Expand All @@ -40,33 +90,33 @@ describe('buildLayout', () => {
await buildLayout(tmpdir.path());

expect(tmpdir.read()).toMatchInlineSnapshot(`
Object {
"bin": Object {
"node": "shim-file-here",
"npm": "shim-file-here",
"npx": "shim-file-here",
"shim": "shim-file-here",
"yarn": "shim-file-here",
},
"cache": Object {
"node": Object {},
},
"log": Object {},
"tmp": Object {},
"tools": Object {
"image": Object {
"node": Object {},
"packages": Object {},
"yarn": Object {},
},
"inventory": Object {
"node": Object {},
"packages": Object {},
"yarn": Object {},
},
"user": Object {},
},
}
`);
Object {
"bin": Object {
"node": "shim-file-here",
"npm": "shim-file-here",
"npx": "shim-file-here",
"shim": "shim-file-here",
"yarn": "shim-file-here",
},
"cache": Object {
"node": Object {},
},
"log": Object {},
"tmp": Object {},
"tools": Object {
"image": Object {
"node": Object {},
"packages": Object {},
"yarn": Object {},
},
"inventory": Object {
"node": Object {},
"packages": Object {},
"yarn": Object {},
},
"user": Object {},
},
}
`);
});
});
49 changes: 35 additions & 14 deletions src/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,41 @@ function voltaVersionHasSetup(version: string): boolean {
return semver.gte(version, '0.7.0');
}

export function buildDownloadUrl(platform: string, version: string): string {
export function buildDownloadUrl(platform: string, arch: string, version: string): string {
let fileName: string;
switch (platform) {
case 'darwin':
fileName = `volta-${version}-macos.tar.gz`;
break;
case 'linux':
fileName = `volta-${version}-linux-openssl-1.1.tar.gz`;
break;
case 'win32':
fileName = `volta-${version}-windows-x86_64.msi`;
break;
default:
throw new Error(`your platform ${platform} is not yet supported`);

const isOpenSSLDependent = semver.lt(version, '1.1.0');

if (isOpenSSLDependent) {
switch (platform) {
case 'darwin':
fileName = `volta-${version}-macos.tar.gz`;
break;
case 'linux': {
fileName = `volta-${version}-linux-openssl-1.1.tar.gz`;
break;
}
case 'win32':
fileName = `volta-${version}-windows-x86_64.msi`;
break;
default:
throw new Error(`your platform ${platform} is not yet supported`);
}
} else {
switch (platform) {
case 'darwin':
fileName = `volta-${version}-macos${arch === 'arm64' ? '-aarch64' : ''}.tar.gz`;
break;
case 'linux': {
fileName = `volta-${version}-linux.tar.gz`;
break;
}
case 'win32':
fileName = `volta-${version}-windows-x86_64.msi`;
break;
default:
throw new Error(`your platform ${platform} is not yet supported`);
}
}

return `https://github.com/volta-cli/volta/releases/download/v${version}/${fileName}`;
Expand Down Expand Up @@ -95,7 +116,7 @@ async function acquireVolta(version: string): Promise<string> {

core.info(`downloading volta@${version}`);

const downloadUrl = buildDownloadUrl(os.platform(), version);
const downloadUrl = await buildDownloadUrl(os.platform(), os.arch(), version);

core.debug(`downloading from \`${downloadUrl}\``);
const downloadPath = await tc.downloadTool(downloadUrl);
Expand Down