github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-19 15:35:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use x86_64 in build name instead of x64

Browse source 
For consistency with the other projects for the unified release process.
This commit is contained in:
Court Ewing 2016-07-19 21:23:16 -04:00
parent e0bc46aad2
commit 694eda8fb7
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -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) |

2
tasks/build/os_packages.js
View file

@ -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',

18
tasks/config/platforms.js
View file

@ -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}-${name}.tar.gz`;
let nodeDir = resolve(rootPath, `.node_binaries/${nodeVersion}/${name}`);
let nodeUrl = win ? `${baseUri}/win-x86/node.exe` : `${baseUri}/node-v${nodeVersion}-${baseName}.tar.gz`;
let nodeDir = resolve(rootPath, `.node_binaries/${nodeVersion}/${baseName}`);
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}`);
}

2
tasks/release_packages.js
View file

@ -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
});