Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build artifact names for unified release process #7490

Merged
merged 2 commits into from
Jun 16, 2016
Merged

Build artifact names for unified release process #7490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c550bbc
Build artifact names for unified release process
epixa Jun 16, 2016
55c4993
README is 5.0.0-alpha4 to match package.json
epixa Jun 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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-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) |
| 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) |
17 changes: 7 additions & 10 deletions tasks/build/os_packages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 = [
Expand Down
14 changes: 8 additions & 6 deletions tasks/config/platforms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -45,8 +47,8 @@ module.exports = function (grunt) {
buildName, buildDir,
tarName, tarPath,
zipName, zipPath,
debName, debPath,
rpmName, rpmPath
debName, debPath, debArch,
rpmName, rpmPath, rpmArch
};
});
};