actions/upload-google-play
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move track validation to a separate function

Browse Source
This commit is contained in:
Jack Boswell (boswelja)
2020-10-23 16:12:01 +13:00
parent 87accbcd41
commit fc19501036
2 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/edits.js
View File

@@ -41,6 +41,10 @@ function uploadToPlayStore(options, releaseFiles) {
auth: options.auth,
packageName: options.applicationId
});
yield validateSelectedTrack(appEdit.data, options).catch(reason => {
core.setFailed(reason);
return Promise.reject(reason);
});
var versionCodes = new Array();
releaseFiles.forEach((releaseFile) => __awaiter(this, void 0, void 0, function* () {
core.debug(`Uploading ${releaseFile}`);
@@ -87,11 +91,6 @@ function uploadRelease(appEdit, options, releaseFile) {
return Promise.reject(`${releaseFile} is invalid`);
}
}
const allTracks = yield getAllTracks(appEdit, options);
if (allTracks == undefined || allTracks.find(value => value.track == options.track) == undefined) {
core.setFailed(`Track "${options.track}" could not be found `);
return Promise.reject(`No track found for "${options.track}"`);
}
if (releaseFile.endsWith('.apk')) {
const apk = yield uploadApk(appEdit, options, releaseFile);
yield uploadMappingFile(appEdit, apk.versionCode, options);
@@ -108,14 +107,18 @@ function uploadRelease(appEdit, options, releaseFile) {
}
});
}
function getAllTracks(appEdit, options) {
function validateSelectedTrack(appEdit, options) {
return __awaiter(this, void 0, void 0, function* () {
const res = yield androidPublisher.edits.tracks.list({
auth: options.auth,
editId: appEdit.id,
packageName: options.applicationId
});
return res.data.tracks;
const allTracks = res.data.tracks;
if (allTracks == undefined || allTracks.find(value => value.track == options.track) == undefined) {
core.setFailed(`Track "${options.track}" could not be found `);
return Promise.reject(`No track found for "${options.track}"`);
}
});
}
function trackVersionCode(appEdit, options, versionCodes) {

48
src/edits.ts
View File

@@ -33,17 +33,22 @@ export async function uploadToPlayStore(options: EditOptions, releaseFiles: stri
packageName: options.applicationId
});
var versionCodes = new Array<number>()
releaseFiles.forEach(async releaseFile => {
core.debug(`Uploading ${releaseFile}`)
const versionCode = await uploadRelease(appEdit.data, options, releaseFile).catch(reason => {
core.setFailed(reason)
return Promise.reject(reason)
})
versionCodes.push(versionCode!)
})
await validateSelectedTrack(appEdit.data, options).catch(reason => {
core.setFailed(reason);
return Promise.reject(reason);
});
const track = trackVersionCode(appEdit.data, options, versionCodes)
var versionCodes = new Array<number>();
releaseFiles.forEach(async releaseFile => {
core.debug(`Uploading ${releaseFile}`);
const versionCode = await uploadRelease(appEdit.data, options, releaseFile).catch(reason => {
core.setFailed(reason);
return Promise.reject(reason);
});
versionCodes.push(versionCode!);
});
const track = trackVersionCode(appEdit.data, options, versionCodes);
const res = await androidPublisher.edits.commit({
auth: options.auth,
editId: appEdit.data.id!,
@@ -51,11 +56,11 @@ export async function uploadToPlayStore(options: EditOptions, releaseFiles: stri
});
if (res.data.id != null) {
core.debug(`Successfully committed ${res.data.id}`)
return Promise.resolve(res.data.id!)
core.debug(`Successfully committed ${res.data.id}`);
return Promise.resolve(res.data.id!);
} else {
core.setFailed(`Error ${res.status}: ${res.statusText}`)
return Promise.reject(res.status)
core.setFailed(`Error ${res.status}: ${res.statusText}`);
return Promise.reject(res.status);
}
}
@@ -77,12 +82,6 @@ async function uploadRelease(appEdit: AppEdit, options: EditOptions, releaseFile
}
}
const allTracks = await getAllTracks(appEdit!, options);
if (allTracks == undefined || allTracks.find(value => value.track == options.track) == undefined) {
core.setFailed(`Track "${options.track}" could not be found `)
return Promise.reject(`No track found for "${options.track}"`)
}
if (releaseFile.endsWith('.apk')) {
const apk = await uploadApk(appEdit, options, releaseFile);
await uploadMappingFile(appEdit, apk.versionCode!, options);
@@ -97,14 +96,17 @@ async function uploadRelease(appEdit: AppEdit, options: EditOptions, releaseFile
}
}
async function getAllTracks(appEdit: AppEdit, options: EditOptions): Promise<Track[] | undefined> {
async function validateSelectedTrack(appEdit: AppEdit, options: EditOptions): Promise<undefined> {
const res = await androidPublisher.edits.tracks.list({
auth: options.auth,
editId: appEdit.id!,
packageName: options.applicationId
});
return res.data.tracks
const allTracks = res.data.tracks;
if (allTracks == undefined || allTracks.find(value => value.track == options.track) == undefined) {
core.setFailed(`Track "${options.track}" could not be found `)
return Promise.reject(`No track found for "${options.track}"`)
}
}
async function trackVersionCode(appEdit: AppEdit, options: EditOptions, versionCodes: number[]): Promise<Track> {