Skip to content
This repository has been archived by the owner on Jun 11, 2021. It is now read-only.

Commit

Permalink
Merge pull request #4180 from jdrouet/release/0.17.4
Browse files Browse the repository at this point in the history
increase version to 0.17.4
  • Loading branch information
pgayvallet committed Oct 15, 2018
2 parents 749b14b + 9665a59 commit dff709f
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 45 deletions.
60 changes: 43 additions & 17 deletions Gruntfile.js
Expand Up @@ -250,9 +250,6 @@ module.exports = function (grunt) {
linux_npm: {
command: 'cd build && npm install --production'
},
linux_zip: {
command: 'ditto -c -k --sequesterRsrc --keepParent <%= LINUX_FILENAME %> release/' + BASENAME + '-Ubuntu.zip'
}
},

clean: {
Expand All @@ -263,15 +260,27 @@ module.exports = function (grunt) {
windows: {
options: {
archive: './release/' + BASENAME + '-Windows.zip',
mode: 'zip'
mode: 'zip',
},
files: [{
expand: true,
dot: true,
cwd: './dist/Kitematic-win32-x64',
src: '**/*'
}]
}
src: '**/*',
}],
},
debian: {
options: {
archive: './release/' + BASENAME + '-Ubuntu.zip',
mode: 'zip',
},
files: [{
expand: true,
dot: true,
cwd: './dist',
src: '*.deb',
}],
},
},

// livereload
Expand Down Expand Up @@ -353,23 +362,26 @@ module.exports = function (grunt) {
categories: [
'Utility'
],
rename: function (dest, src) {
return LINUX_FILENAME;
}
},
linux64: {
options: {
arch: 'amd64'
},
src: './dist/Kitematic-linux-x64/',
dest: './dist/'
dest: './dist/',
rename: function (dest, src) {
return OSX_OUT + '/' + BASENAME + '_' + packagejson.version + '_amd64.deb';
},
},
linux32: {
options: {
arch: 'i386'
},
src: './dist/Kitematic-linux-ia32/',
dest: './dist/'
dest: './dist/',
rename: function (dest, src) {
return OSX_OUT + '/' + BASENAME + '_' + packagejson.version + '_i386.deb';
},
}
},
'electron-installer-redhat': {
Expand All @@ -381,23 +393,26 @@ module.exports = function (grunt) {
categories: [
'Utilities',
],
rename: function (dest, src) {
return LINUX_FILENAME;
},
},
linux64: {
options: {
arch: 'x86_64',
},
src: './dist/Kitematic-linux-x64/',
dest: './dist/',
rename: function (dest, src) {
return OSX_OUT + '/' + BASENAME + '_' + packagejson.version + '_amd64.rpm';
},
},
linux32: {
options: {
arch: 'x86',
},
src: './dist/Kitematic-linux-ia32/',
dest: './dist/',
rename: function (dest, src) {
return OSX_OUT + '/' + BASENAME + '_' + packagejson.version + '_i386.rpm';
},
},
},
});
Expand All @@ -410,18 +425,29 @@ module.exports = function (grunt) {
grunt.registerTask('build', ['newer:babel', 'less', 'newer:copy:dev']);
grunt.registerTask('default', ['build', 'shell:electron', 'watchChokidar']);

grunt.registerTask('release:linux', [
'clean:release', 'build', 'shell:linux_npm',
'shell:linux_npm', 'electron-packager:build',
]);

grunt.registerTask('release:debian:x32', ['release:linux', 'electron-installer-debian:linux32', 'compress:debian']);
grunt.registerTask('release:debian:x64', ['release:linux', 'electron-installer-debian:linux64', 'compress:debian']);

grunt.registerTask('release:redhat:x32', ['release:linux', 'electron-installer-redhat:linux32']);
grunt.registerTask('release:redhat:x64', ['release:linux', 'electron-installer-redhat:linux64']);

grunt.registerTask('release:mac', [
'clean:release', 'build', 'shell:linux_npm',
'electron:osx',
'copy:osx', 'shell:sign', 'shell:zip', 'compress',
'copy:osx', 'shell:sign', 'shell:zip',
'shell:linux_npm', 'electron-packager:osxlnx',
]);

grunt.registerTask('release:windows', [
'clean:release',
'build', 'shell:linux_npm',
'electron:windows',
'copy:windows', 'rcedit:exes', 'compress',
'copy:windows', 'rcedit:exes', 'compress:windows',
]);

process.on('SIGINT', function () {
Expand Down
34 changes: 9 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions package.json
Expand Up @@ -18,10 +18,12 @@
"build": "tsc && npm run tslint",
"integration": "jest -c jest-integration.json",
"prestart": "npm run build",
"release:debian:x32": "grunt release:debian:x32",
"release:debian:x64": "grunt release:debian:x64",
"release:redhat:x32": "grunt release:redhat:x32",
"release:redhat:x64": "grunt release:redhat:x64",
"release:mac": "grunt release:mac && electron-builder --mac",
"release:windows:build": "grunt release:windows",
"release:windows:package": "electron-builder --windows",
"release:windows": "npm run release:windows:build && npm run release:windows:package",
"release:windows": "grunt release:windows",
"start": "grunt",
"start-dev": "npm run build && NODE_ENV=development grunt",
"test": "jest -c jest-unit.json",
Expand Down

0 comments on commit dff709f

Please sign in to comment.