Use x86_64 in build name instead of x64

For consistency with the other projects for the unified release process.
elastic · Jul 20, 2016 · 694eda8 · 694eda8
1 parent e0bc46a
commit 694eda8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ For the daring, snapshot builds are available. These builds are created after ea
 
 | platform |  |
 | --- | --- |
-| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-darwin-x64.tar.gz) |
-| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-x86_64.rpm) |
+| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-darwin-x86_64.tar.gz) |
+| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-linux-x86_64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-x86_64.rpm) |
 | Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-i686.rpm) |
 | Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-windows-x86.zip) |
diff --git a/tasks/build/os_packages.js b/tasks/build/os_packages.js
@@ -15,7 +15,7 @@ export default (grunt) => {
     grunt.file.mkdir(targetDir);
 
     config.get('platforms')
-    .filter(({ name }) => /linux-x(86|64)$/.test(name))
+    .filter(({ name }) => /linux-x86(_64)?$/.test(name))
     .forEach(({ buildDir, debArch, rpmArch }) => {
       const baseOptions = [
         '--force',

diff --git a/tasks/config/platforms.js b/tasks/config/platforms.js
@@ -1,3 +1,5 @@
+import { endsWith } from 'lodash';
+
 module.exports = function (grunt) {
   let { resolve } = require('path');
 
@@ -11,11 +13,15 @@ module.exports = function (grunt) {
     'linux-x64',
     'linux-x86',
     'windows-x86'
-  ].map(function (name) {
-    let win = name === 'windows-x86';
+  ].map(function (baseName) {
+    let win = baseName === 'windows-x86';
+
+    let nodeUrl = win ? `${baseUri}/win-x86/node.exe` : `${baseUri}/node-v${nodeVersion}-${baseName}.tar.gz`;
+    let nodeDir = resolve(rootPath, `.node_binaries/${nodeVersion}/${baseName}`);
 
-    let nodeUrl = win ? `${baseUri}/win-x86/node.exe` : `${baseUri}/node-v${nodeVersion}-${name}.tar.gz`;
-    let nodeDir = resolve(rootPath, `.node_binaries/${nodeVersion}/${name}`);
+    const name = endsWith(baseName, '-x64')
+      ? baseName.replace('-x64', '-x86_64')
+      : baseName;
 
     let buildName = `kibana-${version}-${name}`;
     let buildDir = resolve(rootPath, `build/${buildName}`);
@@ -33,11 +39,11 @@ module.exports = function (grunt) {
     let debArch;
     let rpmArch;
     if (name.match('linux')) {
-      debArch = name.match('x64') ? 'amd64' : 'i386';
+      debArch = name.match('x86_64') ? 'amd64' : 'i386';
       debName = `kibana-${version}-${debArch}.deb`;
       debPath = resolve(rootPath, `target/${debName}`);
 
-      rpmArch = name.match('x64') ? 'x86_64' : 'i686';
+      rpmArch = name.match('x86_64') ? 'x86_64' : 'i686';
       rpmName = `kibana-${version}-${rpmArch}.rpm`;
       rpmPath = resolve(rootPath, `target/${rpmName}`);
     }

diff --git a/tasks/release_packages.js b/tasks/release_packages.js
@@ -90,7 +90,7 @@ export default (grunt) => {
             bucket: publishConfig[environment].bucket,
             prefix: publishConfig[environment].debPrefix.replace('XXXXXXX', trimmedHash),
             signatureKeyId: signature.id,
-            arch: platform.name.match('x64') ? 'amd64' : 'i386',
+            arch: platform.debArch,
             awsKey: aws.key,
             awsSecret: aws.secret
           });