diff --git a/messages/channel.promote.md b/messages/channel.promote.md index 6a5654089..e928060b4 100644 --- a/messages/channel.promote.md +++ b/messages/channel.promote.md @@ -48,7 +48,7 @@ also upload xz # targets -comma-separated targets to promote (e.g.: linux-arm,win32-x64) +comma-separated targets to promote (e.g.: darwin-arm64,win32-x64) # flags.version.summary diff --git a/src/commands/channel/promote.ts b/src/commands/channel/promote.ts index a71238b36..96b895924 100644 --- a/src/commands/channel/promote.ts +++ b/src/commands/channel/promote.ts @@ -19,7 +19,7 @@ import { CLI, Channel, S3Manifest, VersionShaContents } from '../../types.js'; Messages.importMessagesDirectoryFromMetaUrl(import.meta.url); const messages = Messages.loadMessages('@salesforce/plugin-release-management', 'channel.promote'); -const TARGETS = ['linux-x64', 'linux-arm', 'win32-x64', 'win32-x86', 'darwin-x64']; +const TARGETS = ['linux-x64', 'linux-arm64', 'win32-x64', 'win32-arm64', 'darwin-x64', 'darwin-arm64']; export type PromoteResult = { dryRun: boolean; diff --git a/src/commands/cli/install/test.ts b/src/commands/cli/install/test.ts index 1a80935fa..530299bc6 100644 --- a/src/commands/cli/install/test.ts +++ b/src/commands/cli/install/test.ts @@ -98,16 +98,15 @@ namespace Method { class Tarball extends Method.Base { private s3: AmazonS3; private paths = { - darwin: ['x64.tar.gz', 'x64.tar.xz'], + darwin: ['x64.tar.gz', 'x64.tar.xz', 'arm64.tar.gz', 'arm64.tar.xz'], win32: [ 'x64.tar.gz', - 'x86.tar.gz', + 'arm64.tar.gz', // .xz is not supported by powershell's tar command // 'x64.tar.xz', - // 'x86.tar.xz' + // 'arm64.tar.xz' ], - linux: ['x64.tar.gz', 'x64.tar.xz'], - 'linux-arm': ['arm.tar.gz', 'arm.tar.xz'], + linux: ['x64.tar.gz', 'x64.tar.xz', 'arm64.tar.gz', 'arm64.tar.xz'], }; public constructor(protected options: Method.Options) { @@ -157,7 +156,7 @@ class Tarball extends Method.Base { } private getTarballs(platform: Extract): Record { - const paths = platform === 'linux' && os.arch().includes('arm') ? this.paths['linux-arm'] : this.paths[platform]; + const paths = this.paths[platform]; const s3Tarballs = paths.map( (p) => `${this.s3.directory}/channels/${this.options.channel}/${this.options.cli}-${platform}-${p}` ); @@ -330,14 +329,14 @@ class Installer extends Method.Base { } public async win32(): Promise { - const executables = [`${this.options.cli}-x64.exe`, `${this.options.cli}-x86.exe`]; + const executables = [`${this.options.cli}-x64.exe`, `${this.options.cli}-arm64.exe`]; const results: Results = {}; for (const exe of executables) { const url = `${this.s3.directory}/channels/${this.options.channel}/${exe}`; const location = path.join(this.options.directory, exe); // eslint-disable-next-line no-await-in-loop await download(url, location); - const installLocation = `C:\\install-test\\${this.options.cli}\\${exe.includes('x86') ? 'x86' : 'x64'}`; + const installLocation = `C:\\install-test\\${this.options.cli}\\${exe.includes('arm64') ? 'arm64' : 'x64'}`; const cmd = `Start-Process -Wait -FilePath "${location}" -ArgumentList "/S", "/D=${installLocation}" -PassThru`; ux.log(`Installing ${chalk.cyan(exe)} to ${installLocation}...`); const result = shelljs.exec(cmd, { shell: 'powershell.exe' }); @@ -375,8 +374,8 @@ class Installer extends Method.Base { ux.log(`Testing ${chalk.cyan(binaryPath)}`); const result = shelljs.exec(`cmd /c "${binaryPath}" --version`); results[cli] = - result.code === 0 && binaryPath.includes('x86') - ? result.stdout.includes('win32-x86') + result.code === 0 && binaryPath.includes('arm64') + ? result.stdout.includes('win32-arm64') : result.stdout.includes('win32-x64'); } return results; diff --git a/src/commands/cli/versions/inspect.ts b/src/commands/cli/versions/inspect.ts index d8c2a1cb3..47b56fb00 100644 --- a/src/commands/cli/versions/inspect.ts +++ b/src/commands/cli/versions/inspect.ts @@ -62,15 +62,13 @@ const defaultArchives = [ 'sf-darwin-x64.tar.xz', 'sf-darwin-arm64.tar.gz', 'sf-darwin-arm64.tar.xz', - 'sf-linux-arm.tar.gz', - 'sf-linux-arm.tar.xz', 'sf-linux-x64.tar.gz', 'sf-linux-x64.tar.xz', + 'sf-linux-arm64.tar.gz', + 'sf-linux-arm64.tar.xz', 'sf-win32-x64.tar.gz', 'sf-win32-x64.tar.xz', - 'sf-win32-x86.tar.gz', - 'sf-win32-x86.tar.xz', - 'sf-win32-arm64.tar.xz', + 'sf-win32-arm64.tar.gz', 'sf-win32-arm64.tar.xz', ];