From 81c0d2838034f79c450e692dd665b72c42116431 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Thu, 16 Jun 2016 07:58:31 -0400 Subject: [PATCH 1/2] Build artifact names for unified release process These changes are necessary for Kibana to be compatible with Elastic's unified release process from 5.0 onward. The way artifacts get created has not changed, but the naming conventions have. Former-commit-id: c550bbcc958d74d0e5456d5cebfc81750dd2d54e --- README.md | 4 ++-- tasks/build/os_packages.js | 17 +++++++---------- tasks/config/platforms.js | 14 ++++++++------ 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index fcdcca8806b81..e6904602995a4 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,6 @@ 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-SNAPSHOT-darwin-x64.tar.gz) | -| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_5.0.0-SNAPSHOT_amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0_SNAPSHOT-1.x86_64.rpm) | -| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_5.0.0-SNAPSHOT_i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0_SNAPSHOT-1.i386.rpm) | +| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-x86_64.rpm) | +| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-i686.rpm) | | Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-windows.zip) | diff --git a/tasks/build/os_packages.js b/tasks/build/os_packages.js index 5b2b51e00d211..a2cee765f988c 100644 --- a/tasks/build/os_packages.js +++ b/tasks/build/os_packages.js @@ -16,19 +16,14 @@ export default (grunt) => { config.get('platforms') .filter(({ name }) => /linux-x(86|64)$/.test(name)) - .map(({ name, buildDir }) => { - const architecture = /x64$/.test(name) ? 'x86_64' : 'i386'; - return { - buildDir, - architecture - }; - }) - .forEach(({ buildDir, architecture }) => { + .forEach(({ buildDir, debArch, rpmArch }) => { const baseOptions = [ '--force', - '--package', targetDir, + // we force dashes in the version file name because otherwise fpm uses + // the filtered package version, which would have dashes replaced with + // underscores + '--package', `${targetDir}/NAME-${packages.version}-ARCH.TYPE`, '-s', 'dir', // input type - '--architecture', architecture, '--name', packages.name, '--description', packages.description, '--version', packages.version, @@ -52,10 +47,12 @@ export default (grunt) => { ]; const debOptions = [ '-t', 'deb', + '--architecture', debArch, '--deb-priority', 'optional' ]; const rpmOptions = [ '-t', 'rpm', + '--architecture', rpmArch, '--rpm-os', 'linux' ]; const args = [ diff --git a/tasks/config/platforms.js b/tasks/config/platforms.js index 2874f0d894957..aff25a263b026 100644 --- a/tasks/config/platforms.js +++ b/tasks/config/platforms.js @@ -30,13 +30,15 @@ module.exports = function (grunt) { let debPath; let rpmName; let rpmPath; + let debArch; + let rpmArch; if (name.match('linux')) { - let debArch = name.match('x64') ? 'amd64' : 'i386'; - debName = `kibana_${version}_${debArch}.deb`; + debArch = name.match('x64') ? 'amd64' : 'i386'; + debName = `kibana-${version}-${debArch}.deb`; debPath = resolve(rootPath, `target/${debName}`); - let rpmArch = name.match('x64') ? 'x86_64' : 'i386'; - rpmName = `kibana-${version.replace('-', '_')}-1.${rpmArch}.rpm`; + rpmArch = name.match('x64') ? 'x86_64' : 'i686'; + rpmName = `kibana-${version}-${rpmArch}.rpm`; rpmPath = resolve(rootPath, `target/${rpmName}`); } return { @@ -45,8 +47,8 @@ module.exports = function (grunt) { buildName, buildDir, tarName, tarPath, zipName, zipPath, - debName, debPath, - rpmName, rpmPath + debName, debPath, debArch, + rpmName, rpmPath, rpmArch }; }); }; From f5d65e7bed1578d8eb802bfdb94ce0fc68bad787 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Thu, 16 Jun 2016 16:52:58 -0400 Subject: [PATCH 2/2] README is 5.0.0-alpha4 to match package.json We bumped the version in package.json, but we never changed it in the readme. Former-commit-id: 55c499395718ed46f131f9a57927468494b9e35e --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e6904602995a4..37c1e509c31bc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Kibana 5.0.0 +# Kibana 5.0.0-alpha4 Kibana is an open source ([Apache Licensed](https://github.com/elastic/kibana/blob/master/LICENSE.md)), browser based analytics and search dashboard for Elasticsearch. Kibana is a snap to setup and start using. Kibana strives to be easy to get started with, while also being flexible and powerful, just like Elasticsearch. @@ -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-SNAPSHOT-darwin-x64.tar.gz) | -| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-x86_64.rpm) | -| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-i686.rpm) | -| Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-windows.zip) | +| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-darwin-x64.tar.gz) | +| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-x86_64.rpm) | +| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-i686.rpm) | +| Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-windows.zip) |