mirror of
https://github.com/Foundry376/Mailspring.git
synced 2025-09-08 13:44:53 +08:00
Remove custom “upload task”, update Appveyor config
This commit is contained in:
Ben Gotow
parent
dc5884bfb7
commit
95f0efc0f7
5 changed files with 5 additions and 212 deletions
|
|
@ -87,6 +87,4 @@ module.exports = (grunt) => {
|
|||
"create-rpm-installer",
|
||||
]);
|
||||
}
|
||||
|
||||
grunt.registerTask("upload-client", ["upload"])
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,15 +12,15 @@ const version = require(path.join(appDir, 'package.json')).version;
|
|||
const config = {
|
||||
usePackageJson: false,
|
||||
outputDirectory: path.join(appDir, 'dist'),
|
||||
appDirectory: path.join(appDir, 'dist', 'nylas-win32-ia32'),
|
||||
appDirectory: path.join(appDir, 'dist', 'merani-win32-ia32'),
|
||||
loadingGif: path.join(appDir, 'build', 'resources', 'win', 'loading.gif'),
|
||||
iconUrl: 'http://edgehill.s3.amazonaws.com/static/nylas.ico',
|
||||
certificateFile: process.env.CERTIFICATE_FILE,
|
||||
certificatePassword: process.env.WINDOWS_CODESIGN_KEY_PASSWORD,
|
||||
description: "Merani",
|
||||
version: version,
|
||||
title: "nylas",
|
||||
authors: 'Nylas Inc.',
|
||||
title: "merani",
|
||||
authors: 'Foundry 376, LLC',
|
||||
setupIcon: path.join(appDir, 'build', 'resources', 'win', 'nylas.ico'),
|
||||
setupExe: 'MeraniSetup.exe',
|
||||
exe: 'merani.exe',
|
||||
|
|
|
|||
|
|
@ -1,199 +0,0 @@
|
|||
/* eslint global-require: 0 */
|
||||
/* eslint import/no-dynamic-require: 0 */
|
||||
const s3 = require('s3');
|
||||
const request = require('request');
|
||||
const Promise = require('bluebird');
|
||||
const path = require('path');
|
||||
const fs = require('fs-plus');
|
||||
|
||||
|
||||
let s3Client = null;
|
||||
let packageVersion = null;
|
||||
let fullVersion = null;
|
||||
|
||||
module.exports = (grunt) => {
|
||||
const {spawn} = grunt.config('taskHelpers');
|
||||
|
||||
function populateVersion() {
|
||||
return new Promise((resolve, reject) => {
|
||||
const json = grunt.config.get('appJSON')
|
||||
const cmd = 'git';
|
||||
const args = ['rev-parse', '--short', 'HEAD'];
|
||||
spawn({cmd, args}, (error, {stdout} = {}) => {
|
||||
if (error) {
|
||||
return reject();
|
||||
}
|
||||
const commitHash = (stdout ? stdout.trim() : "").slice(0, 7);
|
||||
packageVersion = json.version;
|
||||
if (packageVersion.indexOf('-') > 0) {
|
||||
fullVersion = packageVersion;
|
||||
} else {
|
||||
fullVersion = `${packageVersion}-${commitHash}`;
|
||||
}
|
||||
return resolve();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function postToSlack(msg) {
|
||||
if (!process.env.NYLAS_INTERNAL_HOOK_URL) {
|
||||
return Promise.resolve();
|
||||
}
|
||||
return new Promise((resolve, reject) =>
|
||||
request.post({
|
||||
url: process.env.NYLAS_INTERNAL_HOOK_URL,
|
||||
json: {
|
||||
username: "Edgehill Builds",
|
||||
text: msg,
|
||||
},
|
||||
}
|
||||
, (error) => {
|
||||
return error ? reject(error) : resolve();
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
function put(localSource, destName, options = {}) {
|
||||
grunt.log.writeln(`>> Uploading ${localSource} to S3…`);
|
||||
|
||||
const write = grunt.log.writeln;
|
||||
let lastPc = 0;
|
||||
|
||||
const params = {
|
||||
Key: destName,
|
||||
ACL: "public-read",
|
||||
Bucket: "edgehill",
|
||||
};
|
||||
Object.assign(params, options);
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const uploader = s3Client.uploadFile({
|
||||
localFile: localSource,
|
||||
s3Params: params,
|
||||
});
|
||||
uploader.on("error", err => reject(err));
|
||||
uploader.on("progress", () => {
|
||||
const pc = Math.round((uploader.progressAmount / uploader.progressTotal) * 100.0);
|
||||
if (pc !== lastPc) {
|
||||
lastPc = pc;
|
||||
write(`>> Uploading ${destName} ${pc}%`);
|
||||
return;
|
||||
}
|
||||
});
|
||||
uploader.on("end", data => resolve(data));
|
||||
});
|
||||
}
|
||||
|
||||
function uploadToS3(filepath, key) {
|
||||
grunt.log.writeln(`>> Uploading ${filepath} to ${key}…`);
|
||||
return put(filepath, key).then((data) => {
|
||||
const msg = `Nylas Mail release asset uploaded: <${data.Location}|${key}>`;
|
||||
return postToSlack(msg).then(() => Promise.resolve(data));
|
||||
});
|
||||
}
|
||||
|
||||
grunt.registerTask("upload", "Upload Nylas build", function upload() {
|
||||
const done = this.async();
|
||||
|
||||
populateVersion()
|
||||
.then(() => {
|
||||
// find files to upload
|
||||
const outputDir = grunt.config.get('outputDir');
|
||||
const uploads = [];
|
||||
|
||||
// We increment the version so we have an autoupdate target to test
|
||||
const [version, hash] = fullVersion.split('-');
|
||||
const versionParts = version.split('.')
|
||||
versionParts[2] = +versionParts[2] + 1
|
||||
const nextVersion = `${versionParts.join('.')}-${hash}`
|
||||
|
||||
const s3PathCurrentVersion = `${fullVersion}/${process.platform}/${process.arch}`
|
||||
const s3PathNextVersion = `${nextVersion}/${process.platform}/${process.arch}`
|
||||
|
||||
if (process.platform === 'darwin') {
|
||||
uploads.push({
|
||||
source: `${outputDir}/Merani.zip`,
|
||||
key: `${s3PathCurrentVersion}/Merani.zip`,
|
||||
});
|
||||
uploads.push({
|
||||
source: `${outputDir}/Merani.zip`,
|
||||
key: `${s3PathNextVersion}/Merani.zip`,
|
||||
});
|
||||
uploads.push({
|
||||
source: `${outputDir}/Merani.dmg`,
|
||||
key: `${s3PathCurrentVersion}/Merani.dmg`,
|
||||
});
|
||||
} else if (process.platform === 'win32') {
|
||||
uploads.push({
|
||||
source: path.join(outputDir, "RELEASES"),
|
||||
key: `${s3PathCurrentVersion}/RELEASES`,
|
||||
});
|
||||
uploads.push({
|
||||
source: path.join(outputDir, "MeraniSetup.exe"),
|
||||
key: `${s3PathCurrentVersion}/MeraniSetup.exe`,
|
||||
});
|
||||
uploads.push({
|
||||
source: path.join(outputDir, `Merani-${packageVersion}-full.nupkg`),
|
||||
key: `${s3PathCurrentVersion}/Merani-${packageVersion}-full.nupkg`,
|
||||
});
|
||||
uploads.push({
|
||||
source: path.join(outputDir, "RELEASES"),
|
||||
key: `${s3PathNextVersion}/RELEASES`,
|
||||
});
|
||||
uploads.push({
|
||||
source: path.join(outputDir, "MeraniSetup.exe"),
|
||||
key: `${s3PathNextVersion}/MeraniSetup.exe`,
|
||||
});
|
||||
uploads.push({
|
||||
source: path.join(outputDir, `Merani-${packageVersion}-full.nupkg`),
|
||||
key: `${s3PathNextVersion}/Merani-${packageVersion}-full.nupkg`,
|
||||
});
|
||||
} else if (process.platform === 'linux') {
|
||||
const files = fs.readdirSync(outputDir);
|
||||
for (const file of files) {
|
||||
if (path.extname(file) === '.deb') {
|
||||
uploads.push({
|
||||
source: `${outputDir}/${file}`,
|
||||
key: `${fullVersion}/${process.platform}-deb/${process.arch}/Merani.deb`,
|
||||
options: {ContentType: "application/x-deb"},
|
||||
});
|
||||
}
|
||||
if (path.extname(file) === '.rpm') {
|
||||
uploads.push({
|
||||
source: `${outputDir}/${file}`,
|
||||
key: `${fullVersion}/${process.platform}-rpm/${process.arch}/Merani.rpm`,
|
||||
options: {ContentType: "application/x-rpm"},
|
||||
});
|
||||
}
|
||||
}
|
||||
} else {
|
||||
grunt.fail.fatal(`Unsupported platform: '${process.platform}'`);
|
||||
}
|
||||
|
||||
const awsKey = process.env.AWS_ACCESS_KEY_ID != null ? process.env.AWS_ACCESS_KEY_ID : "";
|
||||
const awsSecret = process.env.AWS_SECRET_ACCESS_KEY != null ? process.env.AWS_SECRET_ACCESS_KEY : "";
|
||||
|
||||
if (awsKey.length === 0) {
|
||||
grunt.fail.fatal("Please set the AWS_ACCESS_KEY_ID environment variable");
|
||||
}
|
||||
if (awsSecret.length === 0) {
|
||||
grunt.fail.fatal("Please set the AWS_SECRET_ACCESS_KEY environment variable");
|
||||
}
|
||||
|
||||
s3Client = s3.createClient({
|
||||
s3Options: {
|
||||
accessKeyId: process.env.AWS_ACCESS_KEY_ID,
|
||||
scretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
|
||||
},
|
||||
});
|
||||
|
||||
return Promise.all(uploads.map(({source, key, options}) =>
|
||||
uploadToS3(source, key, options))
|
||||
)
|
||||
.then(done)
|
||||
})
|
||||
.catch((err) => {
|
||||
grunt.fail.fatal(err)
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
@ -22,13 +22,8 @@ install:
|
|||
}
|
||||
|
||||
build_script:
|
||||
- cmd: npm install
|
||||
|
||||
deploy_script:
|
||||
- ps: |
|
||||
npm run build
|
||||
node app/build/create-signed-windows-installer.js
|
||||
npm run upload
|
||||
- cmd: npm install && npm run build
|
||||
- ps: node app/build/create-signed-windows-installer.js
|
||||
|
||||
environment:
|
||||
matrix:
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
"mkdirp": "^0.5.1",
|
||||
"pm2": "2.4.0",
|
||||
"request": "2.x.x",
|
||||
"s3": "4.x.x",
|
||||
"temp": "0.8.x",
|
||||
"underscore": "1.8.x"
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue