Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit dff709f

Browse files
authored
Merge pull request #4180 from jdrouet/release/0.17.4
increase version to 0.17.4
2 parents 749b14b + 9665a59 commit dff709f

File tree

3 files changed

+57
-45
lines changed

3 files changed

+57
-45
lines changed

Gruntfile.js

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,6 @@ module.exports = function (grunt) {
250250
linux_npm: {
251251
command: 'cd build && npm install --production'
252252
},
253-
linux_zip: {
254-
command: 'ditto -c -k --sequesterRsrc --keepParent <%= LINUX_FILENAME %> release/' + BASENAME + '-Ubuntu.zip'
255-
}
256253
},
257254

258255
clean: {
@@ -263,15 +260,27 @@ module.exports = function (grunt) {
263260
windows: {
264261
options: {
265262
archive: './release/' + BASENAME + '-Windows.zip',
266-
mode: 'zip'
263+
mode: 'zip',
267264
},
268265
files: [{
269266
expand: true,
270267
dot: true,
271268
cwd: './dist/Kitematic-win32-x64',
272-
src: '**/*'
273-
}]
274-
}
269+
src: '**/*',
270+
}],
271+
},
272+
debian: {
273+
options: {
274+
archive: './release/' + BASENAME + '-Ubuntu.zip',
275+
mode: 'zip',
276+
},
277+
files: [{
278+
expand: true,
279+
dot: true,
280+
cwd: './dist',
281+
src: '*.deb',
282+
}],
283+
},
275284
},
276285

277286
// livereload
@@ -353,23 +362,26 @@ module.exports = function (grunt) {
353362
categories: [
354363
'Utility'
355364
],
356-
rename: function (dest, src) {
357-
return LINUX_FILENAME;
358-
}
359365
},
360366
linux64: {
361367
options: {
362368
arch: 'amd64'
363369
},
364370
src: './dist/Kitematic-linux-x64/',
365-
dest: './dist/'
371+
dest: './dist/',
372+
rename: function (dest, src) {
373+
return OSX_OUT + '/' + BASENAME + '_' + packagejson.version + '_amd64.deb';
374+
},
366375
},
367376
linux32: {
368377
options: {
369378
arch: 'i386'
370379
},
371380
src: './dist/Kitematic-linux-ia32/',
372-
dest: './dist/'
381+
dest: './dist/',
382+
rename: function (dest, src) {
383+
return OSX_OUT + '/' + BASENAME + '_' + packagejson.version + '_i386.deb';
384+
},
373385
}
374386
},
375387
'electron-installer-redhat': {
@@ -381,23 +393,26 @@ module.exports = function (grunt) {
381393
categories: [
382394
'Utilities',
383395
],
384-
rename: function (dest, src) {
385-
return LINUX_FILENAME;
386-
},
387396
},
388397
linux64: {
389398
options: {
390399
arch: 'x86_64',
391400
},
392401
src: './dist/Kitematic-linux-x64/',
393402
dest: './dist/',
403+
rename: function (dest, src) {
404+
return OSX_OUT + '/' + BASENAME + '_' + packagejson.version + '_amd64.rpm';
405+
},
394406
},
395407
linux32: {
396408
options: {
397409
arch: 'x86',
398410
},
399411
src: './dist/Kitematic-linux-ia32/',
400412
dest: './dist/',
413+
rename: function (dest, src) {
414+
return OSX_OUT + '/' + BASENAME + '_' + packagejson.version + '_i386.rpm';
415+
},
401416
},
402417
},
403418
});
@@ -410,18 +425,29 @@ module.exports = function (grunt) {
410425
grunt.registerTask('build', ['newer:babel', 'less', 'newer:copy:dev']);
411426
grunt.registerTask('default', ['build', 'shell:electron', 'watchChokidar']);
412427

428+
grunt.registerTask('release:linux', [
429+
'clean:release', 'build', 'shell:linux_npm',
430+
'shell:linux_npm', 'electron-packager:build',
431+
]);
432+
433+
grunt.registerTask('release:debian:x32', ['release:linux', 'electron-installer-debian:linux32', 'compress:debian']);
434+
grunt.registerTask('release:debian:x64', ['release:linux', 'electron-installer-debian:linux64', 'compress:debian']);
435+
436+
grunt.registerTask('release:redhat:x32', ['release:linux', 'electron-installer-redhat:linux32']);
437+
grunt.registerTask('release:redhat:x64', ['release:linux', 'electron-installer-redhat:linux64']);
438+
413439
grunt.registerTask('release:mac', [
414440
'clean:release', 'build', 'shell:linux_npm',
415441
'electron:osx',
416-
'copy:osx', 'shell:sign', 'shell:zip', 'compress',
442+
'copy:osx', 'shell:sign', 'shell:zip',
417443
'shell:linux_npm', 'electron-packager:osxlnx',
418444
]);
419445

420446
grunt.registerTask('release:windows', [
421447
'clean:release',
422448
'build', 'shell:linux_npm',
423449
'electron:windows',
424-
'copy:windows', 'rcedit:exes', 'compress',
450+
'copy:windows', 'rcedit:exes', 'compress:windows',
425451
]);
426452

427453
process.on('SIGINT', function () {

package-lock.json

Lines changed: 9 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
"build": "tsc && npm run tslint",
1919
"integration": "jest -c jest-integration.json",
2020
"prestart": "npm run build",
21+
"release:debian:x32": "grunt release:debian:x32",
22+
"release:debian:x64": "grunt release:debian:x64",
23+
"release:redhat:x32": "grunt release:redhat:x32",
24+
"release:redhat:x64": "grunt release:redhat:x64",
2125
"release:mac": "grunt release:mac && electron-builder --mac",
22-
"release:windows:build": "grunt release:windows",
23-
"release:windows:package": "electron-builder --windows",
24-
"release:windows": "npm run release:windows:build && npm run release:windows:package",
26+
"release:windows": "grunt release:windows",
2527
"start": "grunt",
2628
"start-dev": "npm run build && NODE_ENV=development grunt",
2729
"test": "jest -c jest-unit.json",

0 commit comments

Comments
 (0)