diff --git a/README.md b/README.md index 27f595b..ed2e073 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,6 @@ steps: version: '8.x' - uses: subosito/flutter-action@master with: - version: 'v1.7.8+hotfix.4' + version: '1.7.8+hotfix.4' - run: flutter build apk ``` diff --git a/__tests__/installer.test.ts b/__tests__/installer.test.ts index 1532191..87ae70d 100644 --- a/__tests__/installer.test.ts +++ b/__tests__/installer.test.ts @@ -26,7 +26,7 @@ describe('installer tests', () => { }, 100000); it('Downloads flutter', async () => { - await installer.getFlutter('v1.7.8+hotfix.4', 'stable'); + await installer.getFlutter('1.7.8+hotfix.4', 'stable'); const sdkDir = path.join(toolDir, 'Flutter', '1.7.8', 'x64'); expect(fs.existsSync(`${sdkDir}.complete`)).toBe(true); @@ -34,7 +34,7 @@ describe('installer tests', () => { }, 100000); it('Downloads flutter from beta channel', async () => { - await installer.getFlutter('v1.8.3', 'beta'); + await installer.getFlutter('1.8.3', 'beta'); const sdkDir = path.join(toolDir, 'Flutter', '1.8.3', 'x64'); expect(fs.existsSync(`${sdkDir}.complete`)).toBe(true); diff --git a/lib/installer.js b/lib/installer.js index 0150be1..0f2ad03 100644 --- a/lib/installer.js +++ b/lib/installer.js @@ -57,7 +57,7 @@ function getFlutter(version, channel) { let tempDir = generateTempDir(); const sdkDir = yield extractDownload(sdkFile, tempDir); core.debug(`Flutter sdk extracted to ${sdkDir}`); - toolPath = yield tc.cacheDir(sdkDir, 'Flutter', `${version}-${channel}`); + toolPath = yield tc.cacheDir(sdkDir, 'Flutter', version); } core.exportVariable('FLUTTER_HOME', toolPath); core.addPath(path.join(toolPath, 'bin')); @@ -79,7 +79,7 @@ function extName() { function getDownloadInfo(version, channel) { const os = osName(); const ext = extName(); - const url = `https://storage.googleapis.com/flutter_infra/releases/${channel}/${os}/flutter_${os}_${version}-${channel}.${ext}`; + const url = `https://storage.googleapis.com/flutter_infra/releases/${channel}/${os}/flutter_${os}_v${version}-${channel}.${ext}`; return { version, url diff --git a/src/installer.ts b/src/installer.ts index 8b05e66..4cec2b8 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -46,7 +46,7 @@ export async function getFlutter( const sdkDir = await extractDownload(sdkFile, tempDir); core.debug(`Flutter sdk extracted to ${sdkDir}`); - toolPath = await tc.cacheDir(sdkDir, 'Flutter', `${version}-${channel}`); + toolPath = await tc.cacheDir(sdkDir, 'Flutter', version); } core.exportVariable('FLUTTER_HOME', toolPath); @@ -72,7 +72,7 @@ function getDownloadInfo( ): {version: string; url: string} { const os = osName(); const ext = extName(); - const url = `https://storage.googleapis.com/flutter_infra/releases/${channel}/${os}/flutter_${os}_${version}-${channel}.${ext}`; + const url = `https://storage.googleapis.com/flutter_infra/releases/${channel}/${os}/flutter_${os}_v${version}-${channel}.${ext}`; return { version,