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

Jump to bottom

fix(sdk): use appc.version to sort releases to ensure correct ordering #479

Merged
merged 2 commits into from
May 17, 2021
Merged

fix(sdk): use appc.version to sort releases to ensure correct ordering #479

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b436d
fix(sdk): use appc.version to sort releases to ensure correct ordering
ewanharris May 17, 2021
a5fda6e
chore(release): v5.3.2
ewanharris May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/commands/sdk.js
View file
Open in desktop
Expand Up @@ -164,7 +164,7 @@ async function list(logger, config, cli) {
const [ releases, branches, branchBuilds ] = await Promise.all(tasks);

const sdks = cli.env.sdks;
const vers = Object.keys(sdks).sort().reverse();
const vers = appc.version.sort(Object.keys(sdks)).reverse();

let activeSDK = config.get('sdk.selected', config.get('app.sdk'));
if ((!activeSDK || activeSDK === 'latest') && vers.length) {
Expand Down Expand Up @@ -274,7 +274,7 @@ async function list(logger, config, cli) {
logger.log(' ' + releases.message.red);
} else {
var i = 0;
Array.from(releases.keys()).sort().reverse().forEach(function (r) {
appc.version.sort(Array.from(releases.keys())).reverse().forEach(function (r) {
logger.log(' ' + r.cyan + (Object.prototype.hasOwnProperty.call(sdks, r) ? ' [' + __('installed') + ']' : '') + (i++ === 0 ? ' [' + __('latest') + ']' : ''));
});
i || logger.log(' ' + __('No releases found'));
Expand Down Expand Up @@ -601,7 +601,7 @@ async function install(logger, config, cli) {
const request = await handleInstallArgs(logger, config, cli);

// record the newest sdk already installed
const vers = Object.keys(cli.env.sdks).filter(v => appc.version.gte(v, '3.0.0')).sort().reverse();
const vers = appc.version.sort(Object.keys(cli.env.sdks).filter(v => appc.version.gte(v, '3.0.0'))).reverse();
const newestInstalledSdk = config.get('sdk.selected', config.get('app.sdk', 'latest')) === 'latest' ? (vers.length ? vers[0] : null) : config.get('sdk.selected', config.get('app.sdk'));

const setDefault = cli.argv.default;
Expand Down Expand Up @@ -873,7 +873,7 @@ async function doReleases(logger, config, cli, version, osName) {
}

const isLatest = !version || version === 'latest';
const rels = Array.from(releases.keys()).sort().reverse();
const rels = appc.version.sort(Array.from(releases.keys())).reverse();

// if choosing latest, resolve to latest listed releases
if (isLatest) {
Expand Down Expand Up @@ -1222,7 +1222,7 @@ SdkSubcommands.uninstall = {
*/
async function uninstall(logger, config, cli) {
// Gather up current state of sdks...
const vers = Object.keys(cli.env.sdks).sort().reverse();
const vers = appc.version.sort(Object.keys(cli.env.sdks)).reverse();
const activeSDK = config.get('sdk.selected', config.get('app.sdk', 'latest')) === 'latest' && vers.length ? vers[0] : config.get('sdk.selected', config.get('app.sdk'));
const activeLabel = ' [' + __('selected') + ']';
const maxlen = vers.reduce(function (a, b) {
Expand Down