maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Build artifact names for unified release process

Browse source 
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.
This commit is contained in:
Court Ewing 2016-06-16 07:58:31 -04:00
parent c46172d79f
commit c550bbcc95
3 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

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

17
tasks/build/os_packages.js
View file

@ -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 = [

14
tasks/config/platforms.js
View file

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