From 8a9c9e7f3a4ef4f0a2c7158d722431c5d46b0352 Mon Sep 17 00:00:00 2001 From: "Jack Boswell (boswelja)" Date: Mon, 19 Oct 2020 18:25:02 +1300 Subject: [PATCH] Build updated action --- lib/edits.js | 79 +++++++++++++++++++++++++++++-------------------- lib/main.js | 50 +++++++++++++++++++++---------- lib/whatsnew.js | 27 ++++++++++++----- 3 files changed, 101 insertions(+), 55 deletions(-) diff --git a/lib/edits.js b/lib/edits.js index 8b1ee7fe..5c5032d0 100644 --- a/lib/edits.js +++ b/lib/edits.js @@ -1,4 +1,23 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -8,36 +27,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; - return result; -}; Object.defineProperty(exports, "__esModule", { value: true }); +exports.uploadRelease = void 0; const core = __importStar(require("@actions/core")); const fs = __importStar(require("fs")); const fs_1 = require("fs"); const googleapis_1 = require("googleapis"); const whatsnew_1 = require("./whatsnew"); const androidPublisher = googleapis_1.google.androidpublisher('v3'); -function uploadRelease(options, releaseFile) { +function uploadRelease(options, releaseFiles) { return __awaiter(this, void 0, void 0, function* () { // Check the 'track' for 'internalsharing', if so switch to a non-track api if (options.track === 'internalsharing') { core.debug("Track is Internal app sharing, switch to special upload api"); - if (releaseFile.endsWith('.apk')) { - const res = yield internalSharingUploadApk(options, releaseFile); - return Promise.resolve(res.downloadUrl); - } - else if (releaseFile.endsWith('.aab')) { - const res = yield internalSharingUploadBundle(options, releaseFile); - return Promise.resolve(res.downloadUrl); - } - else { - return Promise.reject(`Unrecognized Release File`); - } + releaseFiles.forEach((releaseFile) => __awaiter(this, void 0, void 0, function* () { + // if (releaseFile.endsWith('.apk')) { + // const res = await internalSharingUploadApk(options, releaseFile) + // return Promise.resolve(res.downloadUrl) + // } else if (releaseFile.endsWith('.aab')) { + // const res = await internalSharingUploadBundle(options, releaseFile) + // return Promise.resolve(res.downloadUrl) + // } else { + // return Promise.reject(`Unrecognized Release File`) + // } + })); } const appEdit = yield androidPublisher.edits.insert({ auth: options.auth, @@ -49,19 +62,21 @@ function uploadRelease(options, releaseFile) { return Promise.reject(`No track found for "${options.track}"`); } let track = undefined; - if (releaseFile.endsWith('.apk')) { - const apk = yield uploadApk(appEdit.data, options, releaseFile); - yield uploadMappingFile(appEdit.data, apk.versionCode, options); - track = yield trackVersionCode(appEdit.data, options, apk.versionCode); - } - else if (releaseFile.endsWith('.aab')) { - const bundle = yield uploadBundle(appEdit.data, options, releaseFile); - yield uploadMappingFile(appEdit.data, bundle.versionCode, options); - track = yield trackVersionCode(appEdit.data, options, bundle.versionCode); - } - else { - return Promise.reject("Invalid release file"); - } + releaseFiles.forEach((releaseFile) => __awaiter(this, void 0, void 0, function* () { + if (releaseFile.endsWith('.apk')) { + const apk = yield uploadApk(appEdit.data, options, releaseFile); + yield uploadMappingFile(appEdit.data, apk.versionCode, options); + track = yield trackVersionCode(appEdit.data, options, apk.versionCode); + } + else if (releaseFile.endsWith('.aab')) { + const bundle = yield uploadBundle(appEdit.data, options, releaseFile); + yield uploadMappingFile(appEdit.data, bundle.versionCode, options); + track = yield trackVersionCode(appEdit.data, options, bundle.versionCode); + } + else { + return Promise.reject("Invalid release file"); + } + })); if (track != undefined) { const res = yield androidPublisher.edits.commit({ auth: options.auth, diff --git a/lib/main.js b/lib/main.js index 951e9a3b..e4b02bd8 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,4 +1,23 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -8,13 +27,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; - return result; -}; Object.defineProperty(exports, "__esModule", { value: true }); const core = __importStar(require("@actions/core")); const fs = __importStar(require("fs")); @@ -29,7 +41,7 @@ function run() { const serviceAccountJson = core.getInput('serviceAccountJson', { required: false }); const serviceAccountJsonRaw = core.getInput('serviceAccountJsonPlainText', { required: false }); const packageName = core.getInput('packageName', { required: true }); - const releaseFile = core.getInput('releaseFile', { required: true }); + const releaseFiles = core.getInput('releaseFile', { required: true }).split("|").filter(x => x !== ""); const track = core.getInput('track', { required: true }); const userFraction = core.getInput('userFraction', { required: false }); const whatsNewDir = core.getInput('whatsNewDirectory', { required: false }); @@ -63,11 +75,13 @@ function run() { else { userFractionFloat = undefined; } - // Check release file - if (!fs.existsSync(releaseFile)) { - core.setFailed(`Unable to find release file @ ${releaseFile}`); - return; - } + // Check release files + releaseFiles.forEach(releaseFile => { + if (!fs.existsSync(releaseFile)) { + core.setFailed(`Unable to find release file @ ${releaseFile}`); + return; + } + }); if (whatsNewDir != undefined && whatsNewDir.length > 0 && !fs.existsSync(whatsNewDir)) { core.setFailed(`Unable to find 'whatsnew' directory @ ${whatsNewDir}`); return; @@ -77,15 +91,19 @@ function run() { return; } const authClient = yield auth.getClient(); - yield edits_1.uploadRelease({ + const downloadUrl = yield edits_1.uploadRelease({ auth: authClient, applicationId: packageName, track: track, userFraction: userFractionFloat, whatsNewDir: whatsNewDir, mappingFile: mappingFile - }, releaseFile); - console.log(`Finished uploading ${releaseFile} to the Play Store`); + }, releaseFiles); + if (downloadUrl) { + core.setOutput('internalSharingDownloadUrl', downloadUrl); + core.exportVariable('INTERNAL_SHARING_DOWNLOAD_URL', downloadUrl); + } + console.log(`Finished uploading to the Play Store`); } catch (error) { core.setFailed(error.message); diff --git a/lib/whatsnew.js b/lib/whatsnew.js index c51a53ce..5bfc4378 100644 --- a/lib/whatsnew.js +++ b/lib/whatsnew.js @@ -1,4 +1,23 @@ "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -8,14 +27,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result["default"] = mod; - return result; -}; Object.defineProperty(exports, "__esModule", { value: true }); +exports.readLocalizedReleaseNotes = void 0; const core = __importStar(require("@actions/core")); const fs = __importStar(require("fs")); const path = __importStar(require("path"));