self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Fixing release process for Android

Browse Source
This commit is contained in:
Laurent Cozic 2019-06-15 18:58:09 +01:00
parent 4083221b21
commit 0e7b2f36c8
2 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Tools/release-android.js
View File

@ -1,5 +1,5 @@
const fs = require('fs-extra');
const { execCommand, githubRelease, githubOauthToken, isWindows, fileExists } = require('./tool-utils.js');
const { execCommand, githubRelease, githubOauthToken, isWindows, fileExists, readline } = require('./tool-utils.js');
const path = require('path');
const fetch = require('node-fetch');
const uriTemplate = require('uri-template');
@ -8,6 +8,17 @@ const rnDir = __dirname + '/../ReactNativeClient';
const rootDir = path.dirname(__dirname);
const releaseDir = rootDir + '/_releases';
function wslToWinPath(wslPath) {
const s = wslPath.split('/');
if (s.length < 3) return s.join('\\');
s.splice(0, 1);
if (s[0] !== 'mnt' || s[1].length !== 1) return s.join('\\');
s.splice(0, 1);
s[0] = s[0].toUpperCase() + ':';
while (s.length && !s[s.length - 1]) s.pop();
return s.join('\\');
}
function increaseGradleVersionCode(content) {
const newContent = content.replace(/versionCode\s+(\d+)/, function(a, versionCode, c) {
const n = Number(versionCode);
@ -64,19 +75,38 @@ async function main() {
console.info('Building APK file v' + version + '...');
let restoreDir = null;
let apkBuildCmd = 'assembleRelease -PbuildDir=build'; // --console plain
let apkBuildCmd = 'assembleRelease -PbuildDir=build';
if (await fileExists('/mnt/c/Windows/System32/cmd.exe')) {
apkBuildCmd = '/mnt/c/Windows/System32/cmd.exe /c "cd ReactNativeClient\\android && gradlew.bat ' + apkBuildCmd + '"';
// In recent versions (of Gradle? React Native?), running gradlew.bat from WSL throws the following error:
// Error: Command failed: /mnt/c/Windows/System32/cmd.exe /c "cd ReactNativeClient\android && gradlew.bat assembleRelease -PbuildDir=build"
// FAILURE: Build failed with an exception.
// * What went wrong:
// Could not determine if Stdout is a console: could not get handle file information (errno 1)
// So we need to manually run the command from DOS, and then coming back here to finish the process once it's done.
console.info('Run this command from DOS:');
console.info('');
console.info('cd "' + wslToWinPath(rootDir) + '\\ReactNativeClient\\android" && gradlew.bat ' + apkBuildCmd + '"');
console.info('');
readline('Press Enter when done:');
apkBuildCmd = ''; // Clear the command because we've already ran it
// apkBuildCmd = '/mnt/c/Windows/System32/cmd.exe /c "cd ReactNativeClient\\android && gradlew.bat ' + apkBuildCmd + '"';
} else {
process.chdir(rnDir + '/android');
apkBuildCmd = './gradlew ' + apkBuildCmd;
restoreDir = rootDir;
}
// const output = await execCommand('/mnt/c/Windows/System32/cmd.exe /c "cd ReactNativeClient\\android && gradlew.bat assembleRelease -PbuildDir=build --console plain"');
console.info(apkBuildCmd);
const output = await execCommand(apkBuildCmd);
console.info(output);
if (apkBuildCmd) {
console.info(apkBuildCmd);
const output = await execCommand(apkBuildCmd);
console.info(output);
}
if (restoreDir) process.chdir(restoreDir);

16
Tools/tool-utils.js
View File

@ -123,6 +123,22 @@ toolUtils.githubRelease = async function(project, tagName, options = null) {
return responseJson;
}
toolUtils.readline = question => {
return new Promise((resolve, reject) => {
const readline = require('readline');
const rl = readline.createInterface({
input: process.stdin,
output: process.stdout
});
rl.question(question + ' ', answer => {
resolve(answer);
rl.close();
});
});
}
toolUtils.isLinux = () => {
return process && process.platform === 'linux';
}