mirror of
https://github.com/subosito/flutter-action.git
synced 2024-08-16 10:19:50 +02:00
Merge pull request #67 from dmitry-shibanov/add-any-channel
Add any channel
This commit is contained in:
Alif Rachmawadi
GitHub
commit
618ffe6e1a
4 changed files with 98 additions and 28 deletions
|
|
@ -113,5 +113,33 @@ describe('release tests', () => {
|
|||
expect(result.rawVersion).toEqual('1.17.0-dev.5.0');
|
||||
expect(result.downloadUrl).toContain('1.17.0-dev.5.0');
|
||||
});
|
||||
|
||||
it('channel: "any", version: "1.17.x"', async () => {
|
||||
const result = await release.determineVersion('1.17.x', 'any', platform);
|
||||
|
||||
expect(result.version).toEqual('1.17.5');
|
||||
expect(result.rawVersion).toEqual('1.17.5');
|
||||
expect(result.downloadUrl).toContain('1.17.5');
|
||||
});
|
||||
|
||||
it('channel: "any", version: "1.19.x"', async () => {
|
||||
const result = await release.determineVersion('1.19.x', 'any', platform);
|
||||
|
||||
expect(result.version).toEqual('1.19.0-5.0.pre');
|
||||
expect(result.rawVersion).toEqual('1.19.0-5.0.pre');
|
||||
expect(result.downloadUrl).toContain('1.19.0-5.0.pre');
|
||||
});
|
||||
|
||||
it('channel: "any", version: "1.19.0-4.x"', async () => {
|
||||
const result = await release.determineVersion(
|
||||
'1.19.0-4.x',
|
||||
'any',
|
||||
platform
|
||||
);
|
||||
|
||||
expect(result.version).toEqual('1.19.0-4.3.pre');
|
||||
expect(result.rawVersion).toEqual('1.19.0-4.3.pre');
|
||||
expect(result.downloadUrl).toContain('1.19.0-4.3.pre');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
36
dist/index.js
vendored
36
dist/index.js
vendored
|
|
@ -105,10 +105,13 @@ function getFlutter(version, channel) {
|
|||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const platform = release.getPlatform();
|
||||
const useMaster = channel == 'master';
|
||||
const { version: selected, downloadUrl } = yield release.determineVersion(version, useMaster ? 'dev' : channel, platform);
|
||||
const { version: selected, downloadUrl, channel: validatedChannel } = yield release.determineVersion(version, useMaster ? 'dev' : channel, platform);
|
||||
if (channel !== validatedChannel) {
|
||||
core.debug(`Channel was identifyed as ${validatedChannel}`);
|
||||
}
|
||||
let cleanver = useMaster
|
||||
? channel
|
||||
: `${selected.replace('+', '-')}-${channel}`;
|
||||
? validatedChannel
|
||||
: `${selected.replace('+', '-')}-${validatedChannel}`;
|
||||
let toolPath = tc.find('flutter', cleanver);
|
||||
if (toolPath) {
|
||||
core.debug(`Tool found in cache ${toolPath}`);
|
||||
|
|
@ -263,7 +266,7 @@ function getLatestVersion(storage, channel) {
|
|||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const channelVersion = storage.releases.find(release => {
|
||||
return (release.hash === storage.current_release[channel] &&
|
||||
release.channel == channel);
|
||||
validateChannel(release.channel, channel));
|
||||
});
|
||||
if (!channelVersion) {
|
||||
throw new Error(`unable to get latest version from channel ${channel}`);
|
||||
|
|
@ -271,22 +274,26 @@ function getLatestVersion(storage, channel) {
|
|||
let rver = channelVersion.version;
|
||||
let cver = rver.startsWith('v') ? rver.slice(1, rver.length) : rver;
|
||||
core.debug(`latest version from channel ${channel} is ${rver}`);
|
||||
return {
|
||||
const flutterData = {
|
||||
channel: channelVersion.channel,
|
||||
version: cver,
|
||||
rawVersion: rver,
|
||||
downloadUrl: `${exports.storageUrl}/${channelVersion.archive}`
|
||||
};
|
||||
return flutterData;
|
||||
});
|
||||
}
|
||||
function validateChannel(releaseChannel, channel) {
|
||||
return releaseChannel === channel || channel === 'any';
|
||||
}
|
||||
function getWildcardVersion(storage, channel, version) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
let sver = version.endsWith('.x')
|
||||
? version.slice(0, version.length - 2)
|
||||
: version;
|
||||
const releases = storage.releases.filter(release => {
|
||||
if (release.channel != channel)
|
||||
return false;
|
||||
return prefixCompare(sver, release.version);
|
||||
return (validateChannel(release.channel, channel) &&
|
||||
prefixCompare(sver, release.version));
|
||||
});
|
||||
const versions = releases
|
||||
.map(release => release.version)
|
||||
|
|
@ -298,28 +305,31 @@ function getWildcardVersion(storage, channel, version) {
|
|||
throw new Error(`unable to find release for ${version}`);
|
||||
}
|
||||
core.debug(`latest version of ${version} from channel ${channel} is ${release.version}`);
|
||||
return {
|
||||
const flutterData = {
|
||||
channel: release.channel,
|
||||
version: cver,
|
||||
rawVersion: release.version,
|
||||
downloadUrl: `${exports.storageUrl}/${release.archive}`
|
||||
};
|
||||
return flutterData;
|
||||
});
|
||||
}
|
||||
function getVersion(storage, channel, version) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const release = storage.releases.find(release => {
|
||||
if (release.channel != channel)
|
||||
return false;
|
||||
return compare(version, release.version);
|
||||
return (validateChannel(release.channel, channel) &&
|
||||
compare(version, release.version));
|
||||
});
|
||||
if (!release) {
|
||||
return getWildcardVersion(storage, channel, version);
|
||||
}
|
||||
return {
|
||||
const flutterData = {
|
||||
channel: release.channel,
|
||||
version,
|
||||
rawVersion: release.version,
|
||||
downloadUrl: `${exports.storageUrl}/${release.archive}`
|
||||
};
|
||||
return flutterData;
|
||||
});
|
||||
}
|
||||
function compare(version, releaseVersion) {
|
||||
|
|
|
|||
|
|
@ -13,15 +13,23 @@ export async function getFlutter(
|
|||
const platform = release.getPlatform();
|
||||
const useMaster = channel == 'master';
|
||||
|
||||
const {version: selected, downloadUrl} = await release.determineVersion(
|
||||
const {
|
||||
version: selected,
|
||||
downloadUrl,
|
||||
channel: validatedChannel
|
||||
} = await release.determineVersion(
|
||||
version,
|
||||
useMaster ? 'dev' : channel,
|
||||
platform
|
||||
);
|
||||
|
||||
if (channel !== validatedChannel) {
|
||||
core.debug(`Channel was identifyed as ${validatedChannel}`);
|
||||
}
|
||||
|
||||
let cleanver = useMaster
|
||||
? channel
|
||||
: `${selected.replace('+', '-')}-${channel}`;
|
||||
? validatedChannel
|
||||
: `${selected.replace('+', '-')}-${validatedChannel}`;
|
||||
|
||||
let toolPath = tc.find('flutter', cleanver);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,13 @@ import * as semver from 'semver';
|
|||
export const storageUrl =
|
||||
'https://storage.googleapis.com/flutter_infra/releases';
|
||||
|
||||
interface IFlutterData {
|
||||
channel: string;
|
||||
version: string;
|
||||
rawVersion: string;
|
||||
downloadUrl: string;
|
||||
}
|
||||
|
||||
interface IFlutterChannel {
|
||||
[key: string]: string;
|
||||
beta: string;
|
||||
|
|
@ -42,7 +49,7 @@ export async function determineVersion(
|
|||
version: string,
|
||||
channel: string,
|
||||
platform: string
|
||||
): Promise<{version: string; rawVersion: string; downloadUrl: string}> {
|
||||
): Promise<IFlutterData> {
|
||||
const storage = await getReleases(platform);
|
||||
|
||||
if (version === '') {
|
||||
|
|
@ -73,11 +80,11 @@ async function getReleases(platform: string): Promise<IFlutterStorage> {
|
|||
async function getLatestVersion(
|
||||
storage: IFlutterStorage,
|
||||
channel: string
|
||||
): Promise<{version: string; rawVersion: string; downloadUrl: string}> {
|
||||
): Promise<IFlutterData> {
|
||||
const channelVersion = storage.releases.find(release => {
|
||||
return (
|
||||
release.hash === storage.current_release[channel] &&
|
||||
release.channel == channel
|
||||
validateChannel(release.channel, channel)
|
||||
);
|
||||
});
|
||||
|
||||
|
|
@ -90,25 +97,34 @@ async function getLatestVersion(
|
|||
|
||||
core.debug(`latest version from channel ${channel} is ${rver}`);
|
||||
|
||||
return {
|
||||
const flutterData: IFlutterData = {
|
||||
channel: channelVersion.channel,
|
||||
version: cver,
|
||||
rawVersion: rver,
|
||||
downloadUrl: `${storageUrl}/${channelVersion.archive}`
|
||||
};
|
||||
|
||||
return flutterData;
|
||||
}
|
||||
|
||||
function validateChannel(releaseChannel: string, channel: string) {
|
||||
return releaseChannel === channel || channel === 'any';
|
||||
}
|
||||
|
||||
async function getWildcardVersion(
|
||||
storage: IFlutterStorage,
|
||||
channel: string,
|
||||
version: string
|
||||
): Promise<{version: string; rawVersion: string; downloadUrl: string}> {
|
||||
): Promise<IFlutterData> {
|
||||
let sver = version.endsWith('.x')
|
||||
? version.slice(0, version.length - 2)
|
||||
: version;
|
||||
|
||||
const releases = storage.releases.filter(release => {
|
||||
if (release.channel != channel) return false;
|
||||
return prefixCompare(sver, release.version);
|
||||
return (
|
||||
validateChannel(release.channel, channel) &&
|
||||
prefixCompare(sver, release.version)
|
||||
);
|
||||
});
|
||||
|
||||
const versions = releases
|
||||
|
|
@ -130,32 +146,40 @@ async function getWildcardVersion(
|
|||
`latest version of ${version} from channel ${channel} is ${release.version}`
|
||||
);
|
||||
|
||||
return {
|
||||
const flutterData = {
|
||||
channel: release.channel,
|
||||
version: cver,
|
||||
rawVersion: release.version,
|
||||
downloadUrl: `${storageUrl}/${release.archive}`
|
||||
};
|
||||
|
||||
return flutterData;
|
||||
}
|
||||
|
||||
async function getVersion(
|
||||
storage: IFlutterStorage,
|
||||
channel: string,
|
||||
version: string
|
||||
): Promise<{version: string; rawVersion: string; downloadUrl: string}> {
|
||||
): Promise<IFlutterData> {
|
||||
const release = storage.releases.find(release => {
|
||||
if (release.channel != channel) return false;
|
||||
return compare(version, release.version);
|
||||
return (
|
||||
validateChannel(release.channel, channel) &&
|
||||
compare(version, release.version)
|
||||
);
|
||||
});
|
||||
|
||||
if (!release) {
|
||||
return getWildcardVersion(storage, channel, version);
|
||||
}
|
||||
|
||||
return {
|
||||
const flutterData = {
|
||||
channel: release.channel,
|
||||
version,
|
||||
rawVersion: release.version,
|
||||
downloadUrl: `${storageUrl}/${release.archive}`
|
||||
};
|
||||
|
||||
return flutterData;
|
||||
}
|
||||
|
||||
function compare(version: string, releaseVersion: string): boolean {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue