fix: use target tarball

oclif · Apr 10, 2018 · 701e8c7 · 701e8c7
1 parent 06b455d
commit 701e8c7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/commands/update.ts b/src/commands/update.ts
@@ -22,7 +22,6 @@ export default class UpdateCommand extends Command {
   private channel!: string
   private readonly clientRoot = path.join(this.config.dataDir, 'client')
   private readonly clientBin = path.join(this.clientRoot, 'bin', this.config.windows ? `${this.config.bin}.cmd` : this.config.bin)
-  private readonly s3Host = this.config.pjson.oclif.update.s3.host
 
   async run() {
     const {args, flags} = this.parse(UpdateCommand)
@@ -46,7 +45,11 @@ export default class UpdateCommand extends Command {
   private async fetchManifest(): Promise<IManifest> {
     const http: typeof HTTP = require('http-call').HTTP
     try {
-      const url = this.config.s3Url(this.config.s3Key('manifest'))
+      const url = this.config.s3Url(this.config.s3Key('manifest', {
+        channel: this.channel,
+        platform: this.config.platform,
+        arch: this.config.arch
+      }))
       let {body} = await http.get(url)
       return body
     } catch (err) {

diff --git a/test/commands/update.test.ts b/test/commands/update.test.ts
@@ -45,18 +45,28 @@ describe('update', () => {
       await qq.x('./tmp/example-cli/bin/example-cli', args)
     }
     await release('1.0.0')
+    await release('2.0.0-beta')
     await checkVersion('1.0.0', process.versions.node)
     await update()
     await checkVersion('1.0.0')
     await release('1.0.1')
     await checkVersion('1.0.0')
     await update()
     await checkVersion('1.0.1')
-    await release('2.0.0-beta')
-    await checkVersion('1.0.1')
     await update()
     await checkVersion('1.0.1')
     await update('beta')
     await checkVersion(`2.0.0-beta.${sha}`)
+    await release('2.0.1-beta')
+    await checkVersion(`2.0.0-beta.${sha}`)
+    await update()
+    await checkVersion(`2.0.1-beta.${sha}`)
+    await update()
+    await checkVersion(`2.0.1-beta.${sha}`)
+    await release('1.0.3')
+    await update()
+    await checkVersion(`2.0.1-beta.${sha}`)
+    await update('stable')
+    await checkVersion('1.0.3')
   })
 })