Merge branch 'master' into v1-release
This commit is contained in:
		
						commit
						cef99a71be
					
				
							
								
								
									
										11
									
								
								lib/main.js
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								lib/main.js
									
									
									
									
									
								
							@ -1,10 +1,9 @@
 | 
				
			|||||||
"use strict";
 | 
					"use strict";
 | 
				
			||||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
 | 
					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) {
 | 
					    return new (P || (P = Promise))(function (resolve, reject) {
 | 
				
			||||||
        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
 | 
					        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
 | 
				
			||||||
        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
 | 
					        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
 | 
				
			||||||
        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
 | 
					        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
 | 
				
			||||||
        step((generator = generator.apply(thisArg, _arguments || [])).next());
 | 
					        step((generator = generator.apply(thisArg, _arguments || [])).next());
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
@ -23,13 +22,13 @@ function get_release_by_tag(tag, octokit, context) {
 | 
				
			|||||||
    return __awaiter(this, void 0, void 0, function* () {
 | 
					    return __awaiter(this, void 0, void 0, function* () {
 | 
				
			||||||
        try {
 | 
					        try {
 | 
				
			||||||
            core.debug(`Getting release by tag ${tag}.`);
 | 
					            core.debug(`Getting release by tag ${tag}.`);
 | 
				
			||||||
            return yield octokit.repos.getReleaseByTag(Object.assign(Object.assign({}, context.repo), { tag: tag }));
 | 
					            return yield octokit.repos.getReleaseByTag(Object.assign({}, context.repo, { tag: tag }));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        catch (error) {
 | 
					        catch (error) {
 | 
				
			||||||
            // If this returns 404, we need to create the release first.
 | 
					            // If this returns 404, we need to create the release first.
 | 
				
			||||||
            if (error.status === 404) {
 | 
					            if (error.status === 404) {
 | 
				
			||||||
                core.debug(`Release for tag ${tag} doesn't exist yet so we'll create it now.`);
 | 
					                core.debug(`Release for tag ${tag} doesn't exist yet so we'll create it now.`);
 | 
				
			||||||
                return yield octokit.repos.createRelease(Object.assign(Object.assign({}, context.repo), { tag_name: tag }));
 | 
					                return yield octokit.repos.createRelease(Object.assign({}, context.repo, { tag_name: tag }));
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            else {
 | 
					            else {
 | 
				
			||||||
                throw error;
 | 
					                throw error;
 | 
				
			||||||
@ -42,12 +41,12 @@ function upload_to_release(release, file, asset_name, tag, overwrite, octokit, c
 | 
				
			|||||||
        const file_size = fs.statSync(file).size;
 | 
					        const file_size = fs.statSync(file).size;
 | 
				
			||||||
        const file_bytes = fs.readFileSync(file);
 | 
					        const file_bytes = fs.readFileSync(file);
 | 
				
			||||||
        // Check for duplicates.
 | 
					        // Check for duplicates.
 | 
				
			||||||
        const assets = yield octokit.repos.listAssetsForRelease(Object.assign(Object.assign({}, context.repo), { release_id: release.data.id }));
 | 
					        const assets = yield octokit.repos.listAssetsForRelease(Object.assign({}, context.repo, { release_id: release.data.id }));
 | 
				
			||||||
        const duplicate_asset = assets.data.find(a => a.name === asset_name);
 | 
					        const duplicate_asset = assets.data.find(a => a.name === asset_name);
 | 
				
			||||||
        if (duplicate_asset !== undefined) {
 | 
					        if (duplicate_asset !== undefined) {
 | 
				
			||||||
            if (overwrite === "true") {
 | 
					            if (overwrite === "true") {
 | 
				
			||||||
                core.debug(`An asset called ${asset_name} already exists in release ${tag} so we'll overwrite it.`);
 | 
					                core.debug(`An asset called ${asset_name} already exists in release ${tag} so we'll overwrite it.`);
 | 
				
			||||||
                yield octokit.repos.deleteReleaseAsset(Object.assign(Object.assign({}, context.repo), { asset_id: duplicate_asset.id }));
 | 
					                yield octokit.repos.deleteReleaseAsset(Object.assign({}, context.repo, { asset_id: duplicate_asset.id }));
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            else {
 | 
					            else {
 | 
				
			||||||
                core.setFailed(`An asset called ${asset_name} already exists.`);
 | 
					                core.setFailed(`An asset called ${asset_name} already exists.`);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user