1 Commits

Author SHA1 Message Date
Drew Heavner
b6496ac4e3 Fixed precondition checks for whatsnew and mapping files, to fix issues outlined in #2 2019-12-12 08:50:26 -05:00
5 changed files with 11 additions and 11 deletions

View File

@@ -100,7 +100,7 @@ function trackVersionCode(appEdit, options, versionCode) {
} }
function readLocalizedReleaseNotes(whatsNewDir) { function readLocalizedReleaseNotes(whatsNewDir) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
if (whatsNewDir != undefined) { if (whatsNewDir != undefined && whatsNewDir.length > 0) {
const releaseNotes = fs.readdirSync(whatsNewDir).filter(value => /whatsnew-*-*/.test(value)); const releaseNotes = fs.readdirSync(whatsNewDir).filter(value => /whatsnew-*-*/.test(value));
const pattern = /whatsnew-(?<local>.*-.*)/.compile(); const pattern = /whatsnew-(?<local>.*-.*)/.compile();
let localizedReleaseNotes = []; let localizedReleaseNotes = [];
@@ -125,7 +125,7 @@ function readLocalizedReleaseNotes(whatsNewDir) {
} }
function uploadMappingFile(appEdit, versionCode, options) { function uploadMappingFile(appEdit, versionCode, options) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
if (options.mappingFile != undefined) { if (options.mappingFile != undefined && options.mappingFile.length > 0) {
const mapping = fs_1.readFileSync(options.mappingFile, 'utf-8'); const mapping = fs_1.readFileSync(options.mappingFile, 'utf-8');
if (mapping != undefined) { if (mapping != undefined) {
core.debug(`[${appEdit.id}, versionCode=${versionCode}, packageName=${options.applicationId}]: Uploading Proguard mapping file @ ${options.mappingFile}`); core.debug(`[${appEdit.id}, versionCode=${versionCode}, packageName=${options.applicationId}]: Uploading Proguard mapping file @ ${options.mappingFile}`);

View File

@@ -48,11 +48,11 @@ function run() {
core.setFailed(`Unable to find release file @ ${releaseFile}`); core.setFailed(`Unable to find release file @ ${releaseFile}`);
return; return;
} }
if (whatsNewDir != undefined && !fs.existsSync(whatsNewDir)) { if (whatsNewDir != undefined && whatsNewDir.length > 0 && !fs.existsSync(whatsNewDir)) {
core.setFailed(`Unable to find 'whatsnew' directory @ ${whatsNewDir}`); core.setFailed(`Unable to find 'whatsnew' directory @ ${whatsNewDir}`);
return; return;
} }
if (mappingFile != undefined && !fs.existsSync(mappingFile)) { if (mappingFile != undefined && mappingFile.length > 0 && !fs.existsSync(mappingFile)) {
core.setFailed(`Unable to find 'mappingFile' @ ${mappingFile}`); core.setFailed(`Unable to find 'mappingFile' @ ${mappingFile}`);
return; return;
} }
@@ -67,7 +67,7 @@ function run() {
whatsNewDir: whatsNewDir, whatsNewDir: whatsNewDir,
mappingFile: mappingFile mappingFile: mappingFile
}, releaseFile); }, releaseFile);
core.debug('Finished App Release!'); console.log(`Finished uploading ${releaseFile} to the Play Store`);
} }
catch (error) { catch (error) {
core.setFailed(error.message); core.setFailed(error.message);

View File

@@ -1,6 +1,6 @@
{ {
"name": "upload-google-play", "name": "upload-google-play",
"version": "1.0.0", "version": "1.0.2",
"private": true, "private": true,
"description": "Upload an Android release (.apk or .aab) to Google Play Console", "description": "Upload an Android release (.apk or .aab) to Google Play Console",
"main": "lib/main.js", "main": "lib/main.js",

View File

@@ -106,7 +106,7 @@ async function trackVersionCode(appEdit: AppEdit, options: EditOptions, versionC
} }
async function readLocalizedReleaseNotes(whatsNewDir: string | undefined): Promise<LocalizedText[] | undefined> { async function readLocalizedReleaseNotes(whatsNewDir: string | undefined): Promise<LocalizedText[] | undefined> {
if (whatsNewDir != undefined) { if (whatsNewDir != undefined && whatsNewDir.length > 0) {
const releaseNotes = fs.readdirSync(whatsNewDir).filter(value => /whatsnew-*-*/.test(value)); const releaseNotes = fs.readdirSync(whatsNewDir).filter(value => /whatsnew-*-*/.test(value));
const pattern = /whatsnew-(?<local>.*-.*)/.compile(); const pattern = /whatsnew-(?<local>.*-.*)/.compile();
@@ -136,7 +136,7 @@ async function readLocalizedReleaseNotes(whatsNewDir: string | undefined): Promi
} }
async function uploadMappingFile(appEdit: AppEdit, versionCode: number, options: EditOptions) { async function uploadMappingFile(appEdit: AppEdit, versionCode: number, options: EditOptions) {
if (options.mappingFile != undefined) { if (options.mappingFile != undefined && options.mappingFile.length > 0) {
const mapping = readFileSync(options.mappingFile, 'utf-8'); const mapping = readFileSync(options.mappingFile, 'utf-8');
if (mapping != undefined) { if (mapping != undefined) {
core.debug(`[${appEdit.id}, versionCode=${versionCode}, packageName=${options.applicationId}]: Uploading Proguard mapping file @ ${options.mappingFile}`); core.debug(`[${appEdit.id}, versionCode=${versionCode}, packageName=${options.applicationId}]: Uploading Proguard mapping file @ ${options.mappingFile}`);

View File

@@ -34,12 +34,12 @@ async function run() {
return return
} }
if (whatsNewDir != undefined && !fs.existsSync(whatsNewDir)) { if (whatsNewDir != undefined && whatsNewDir.length > 0 && !fs.existsSync(whatsNewDir)) {
core.setFailed(`Unable to find 'whatsnew' directory @ ${whatsNewDir}`); core.setFailed(`Unable to find 'whatsnew' directory @ ${whatsNewDir}`);
return return
} }
if (mappingFile != undefined && !fs.existsSync(mappingFile)) { if (mappingFile != undefined && mappingFile.length > 0 && !fs.existsSync(mappingFile)) {
core.setFailed(`Unable to find 'mappingFile' @ ${mappingFile}`); core.setFailed(`Unable to find 'mappingFile' @ ${mappingFile}`);
return return
} }
@@ -58,7 +58,7 @@ async function run() {
mappingFile: mappingFile mappingFile: mappingFile
}, releaseFile); }, releaseFile);
core.debug('Finished App Release!') console.log(`Finished uploading ${releaseFile} to the Play Store`)
} catch (error) { } catch (error) {
core.setFailed(error.message) core.setFailed(error.message)
} }