Prepare 1.6.0 release

__tests__/ArtifactUploader.test.ts

@@ -1,7 +1,6 @@
 import { Artifact } from "../src/Artifact"
 import { GithubArtifactUploader } from "../src/ArtifactUploader"
 import { Releases } from "../src/Releases";
-import { RequestError } from '@octokit/request-error'
 
 const artifacts = [
     new Artifact('a/art1'),
@@ -33,7 +32,6 @@ describe('ArtifactUploader', () => {
     it('replaces all artifacts', async () => {
         mockDeleteSuccess()
         mockListWithAssets()
-        mockUploadArtifact()
         const uploader = createUploader(true)
 
         await uploader.uploadArtifacts(artifacts, releaseId, url)
@@ -52,65 +50,6 @@ describe('ArtifactUploader', () => {
     it('replaces no artifacts when previous asset list empty', async () => {
         mockDeleteSuccess()
         mockListWithoutAssets()
-        mockUploadArtifact()
-        const uploader = createUploader(true)
-
-        await uploader.uploadArtifacts(artifacts, releaseId, url)
-
-        expect(uploadMock).toBeCalledTimes(2)
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art1')
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art2')
-
-        expect(deleteMock).toBeCalledTimes(0)
-    })
-
-    it('retry when upload failed with 5xx response', async () => {
-        mockListWithoutAssets()
-        mockUploadArtifact(500, 2)
-        const uploader = createUploader(true)
-
-        await uploader.uploadArtifacts(artifacts, releaseId, url)
-
-        expect(uploadMock).toBeCalledTimes(4)
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art1')
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art1')
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art1')
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art2')
-
-        expect(deleteMock).toBeCalledTimes(0)
-    })
-
-    it('abort when upload failed with 5xx response after 3 attemps', async () => {
-        mockListWithoutAssets()
-        mockUploadArtifact(500, 4)
-        const uploader = createUploader(true)
-
-        await uploader.uploadArtifacts(artifacts, releaseId, url)
-
-        expect(uploadMock).toBeCalledTimes(5)
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art1')
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art1')
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art1')
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art2')
-        expect(uploadMock)
-            .toBeCalledWith(url, contentLength, 'raw', fileContents, 'art2')
-
-        expect(deleteMock).toBeCalledTimes(0)
-    })
-
-    it('abort when upload failed with non-5xx response', async () => {
-        mockListWithoutAssets()
-        mockUploadArtifact(401, 2)
         const uploader = createUploader(true)
 
         await uploader.uploadArtifacts(artifacts, releaseId, url)
@@ -127,7 +66,6 @@ describe('ArtifactUploader', () => {
     it('throws error from replace', async () => {
         mockDeleteError()
         mockListWithAssets()
-        mockUploadArtifact()
         const uploader = createUploader(true)
 
         expect.hasAssertions()
@@ -141,7 +79,6 @@ describe('ArtifactUploader', () => {
     it('updates all artifacts, delete none', async () => {
         mockDeleteError()
         mockListWithAssets()
-        mockUploadArtifact()
         const uploader = createUploader(false)
 
         await uploader.uploadArtifacts(artifacts, releaseId, url)
@@ -156,6 +93,7 @@ describe('ArtifactUploader', () => {
     })
 
     function createUploader(replaces: boolean): GithubArtifactUploader {
+        uploadMock.mockResolvedValue({})
         const MockReleases = jest.fn<Releases, any>(() => {
             return {
                 create: jest.fn(),
@@ -196,12 +134,4 @@ describe('ArtifactUploader', () => {
     function mockListWithoutAssets() {
         listArtifactsMock.mockResolvedValue({ data: [] })
     }
-
-    function mockUploadArtifact(status: number = 200, failures: number = 0) {
-        const error = new RequestError(`HTTP ${status}`, status, { headers: {}, request: { method: 'GET', url: '', headers: {} } })
-        for (let index = 0; index < failures; index++) {
-            uploadMock.mockRejectedValueOnce(error)
-        }
-        uploadMock.mockResolvedValue({})
-    }
 });

action.yml

@@ -6,7 +6,6 @@ inputs:
     description: 'An optional flag which indicates if we should update a release if it already exists. Defaults to false.'
     default: ''
   artifact:
-    deprecationMessage: Use 'artifacts' instead.
     description: 'An optional set of paths representing artifacts to upload to the release. This may be a single path or a comma delimited list of paths (or globs)'
     default: ''
   artifacts:

lib/Action.js

@@ -1,4 +1,13 @@
 "use strict";
+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) {
+        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 step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ErrorMessage_1 = require("./ErrorMessage");
 class Action {
@@ -7,24 +16,27 @@ class Action {
         this.releases = releases;
         this.uploader = uploader;
     }
-    async perform() {
+    perform() {
-        const releaseResponse = await this.createOrUpdateRelease();
+        return __awaiter(this, void 0, void 0, function* () {
+            const releaseResponse = yield this.createOrUpdateRelease();
             const releaseId = releaseResponse.id;
             const uploadUrl = releaseResponse.upload_url;
             const artifacts = this.inputs.artifacts;
             if (artifacts.length > 0) {
-            await this.uploader.uploadArtifacts(artifacts, releaseId, uploadUrl);
+                yield this.uploader.uploadArtifacts(artifacts, releaseId, uploadUrl);
             }
+        });
     }
-    async createOrUpdateRelease() {
+    createOrUpdateRelease() {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.inputs.allowUpdates) {
                 try {
-                const getResponse = await this.releases.getByTag(this.inputs.tag);
+                    const getResponse = yield this.releases.getByTag(this.inputs.tag);
-                return await this.updateRelease(getResponse.data.id);
+                    return yield this.updateRelease(getResponse.data.id);
                 }
                 catch (error) {
                     if (this.noPublishedRelease(error)) {
-                    return await this.updateDraftOrCreateRelease();
+                        return yield this.updateDraftOrCreateRelease();
                     }
                     else {
                         throw error;
@@ -32,37 +44,46 @@ class Action {
                 }
             }
             else {
-            return await this.createRelease();
+                return yield this.createRelease();
             }
+        });
     }
-    async updateRelease(id) {
+    updateRelease(id) {
-        const response = await this.releases.update(id, this.inputs.tag, this.inputs.body, this.inputs.commit, this.inputs.draft, this.inputs.name, this.inputs.prerelease);
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.releases.update(id, this.inputs.tag, this.inputs.body, this.inputs.commit, this.inputs.draft, this.inputs.name, this.inputs.prerelease);
             return response.data;
+        });
     }
     noPublishedRelease(error) {
         const errorMessage = new ErrorMessage_1.ErrorMessage(error);
         return errorMessage.status == 404;
     }
-    async updateDraftOrCreateRelease() {
+    updateDraftOrCreateRelease() {
-        const draftReleaseId = await this.findMatchingDraftReleaseId();
+        return __awaiter(this, void 0, void 0, function* () {
+            const draftReleaseId = yield this.findMatchingDraftReleaseId();
             if (draftReleaseId) {
-            return await this.updateRelease(draftReleaseId);
+                return yield this.updateRelease(draftReleaseId);
             }
             else {
-            return await this.createRelease();
+                return yield this.createRelease();
             }
+        });
     }
-    async findMatchingDraftReleaseId() {
+    findMatchingDraftReleaseId() {
         var _a;
+        return __awaiter(this, void 0, void 0, function* () {
             const tag = this.inputs.tag;
-        const response = await this.releases.listReleases();
+            const response = yield this.releases.listReleases();
             const releases = response.data;
             const draftRelease = releases.find(release => release.draft && release.tag_name == tag);
             return (_a = draftRelease) === null || _a === void 0 ? void 0 : _a.id;
+        });
     }
-    async createRelease() {
+    createRelease() {
-        const response = await this.releases.create(this.inputs.tag, this.inputs.body, this.inputs.commit, this.inputs.draft, this.inputs.name, this.inputs.prerelease);
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.releases.create(this.inputs.tag, this.inputs.body, this.inputs.commit, this.inputs.draft, this.inputs.name, this.inputs.prerelease);
             return response.data;
+        });
     }
 }
 exports.Action = Action;

lib/ArtifactUploader.js

@@ -1,4 +1,13 @@
 "use strict";
+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) {
+        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 step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -9,47 +18,43 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 class GithubArtifactUploader {
-    constructor(releases, replacesExistingArtifacts = true) {
+    constructor(releases, replacesExistingArtifacts) {
+        this.replacesExistingArtifacts = true;
         this.releases = releases;
         this.replacesExistingArtifacts = replacesExistingArtifacts;
     }
-    async uploadArtifacts(artifacts, releaseId, uploadUrl) {
+    uploadArtifacts(artifacts, releaseId, uploadUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.replacesExistingArtifacts) {
-            await this.deleteUpdatedArtifacts(artifacts, releaseId);
+                yield this.deleteUpdatedArtifacts(artifacts, releaseId);
             }
             for (const artifact of artifacts) {
-            await this.uploadArtifact(artifact, uploadUrl);
-        }
-    }
-    async uploadArtifact(artifact, uploadUrl, retry = 3) {
                 try {
-            core.debug(`Uploading artifact ${artifact.name}...`);
+                    yield this.releases.uploadArtifact(uploadUrl, artifact.contentLength, artifact.contentType, artifact.readFile(), artifact.name);
-            await this.releases.uploadArtifact(uploadUrl, artifact.contentLength, artifact.contentType, artifact.readFile(), artifact.name);
                 }
                 catch (error) {
-            if (error.status >= 500 && retry > 0) {
+                    const message = `Failed to upload artifact ${artifact.name}. Does it already exist?`;
-                core.warning(`Failed to upload artifact ${artifact.name}. ${error.message}. Retrying...`);
+                    core.warning(message);
-                await this.uploadArtifact(artifact, uploadUrl, retry - 1);
-            }
-            else {
-                core.warning(`Failed to upload artifact ${artifact.name}. ${error.message}.`);
                 }
             }
+            return Promise.resolve();
+        });
     }
-    async deleteUpdatedArtifacts(artifacts, releaseId) {
+    deleteUpdatedArtifacts(artifacts, releaseId) {
-        const response = await this.releases.listArtifactsForRelease(releaseId);
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.releases.listArtifactsForRelease(releaseId);
             const releaseAssets = response.data;
-        const assetByName = {};
+            const assetByName = new Map();
             releaseAssets.forEach(asset => {
                 assetByName[asset.name] = asset;
             });
             for (const artifact of artifacts) {
                 const asset = assetByName[artifact.name];
                 if (asset) {
-                core.debug(`Deleting existing artifact ${artifact.name}...`);
+                    yield this.releases.deleteArtifact(asset.id);
-                await this.releases.deleteArtifact(asset.id);
                 }
             }
+        });
     }
 }
 exports.GithubArtifactUploader = GithubArtifactUploader;

lib/Main.js

@@ -1,4 +1,13 @@
 "use strict";
+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) {
+        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 step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -15,15 +24,17 @@ const Action_1 = require("./Action");
 const ArtifactUploader_1 = require("./ArtifactUploader");
 const ArtifactGlobber_1 = require("./ArtifactGlobber");
 const ErrorMessage_1 = require("./ErrorMessage");
-async function run() {
+function run() {
+    return __awaiter(this, void 0, void 0, function* () {
         try {
             const action = createAction();
-        await action.perform();
+            yield action.perform();
         }
         catch (error) {
             const errorMessage = new ErrorMessage_1.ErrorMessage(error);
             core.setFailed(errorMessage.toString());
         }
+    });
 }
 function createAction() {
     const token = core.getInput('token');

lib/Releases.js

@@ -1,11 +1,21 @@
 "use strict";
+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) {
+        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 step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 class GithubReleases {
     constructor(context, git) {
         this.context = context;
         this.git = git;
     }
-    async create(tag, body, commitHash, draft, name, prerelease) {
+    create(tag, body, commitHash, draft, name, prerelease) {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.git.repos.createRelease({
                 body: body,
                 name: name,
@@ -16,35 +26,45 @@ class GithubReleases {
                 target_commitish: commitHash,
                 tag_name: tag
             });
+        });
     }
-    async deleteArtifact(assetId) {
+    deleteArtifact(assetId) {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.git.repos.deleteReleaseAsset({
                 asset_id: assetId,
                 owner: this.context.repo.owner,
                 repo: this.context.repo.repo
             });
+        });
     }
-    async listArtifactsForRelease(releaseId) {
+    listArtifactsForRelease(releaseId) {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.git.repos.listAssetsForRelease({
                 owner: this.context.repo.owner,
                 release_id: releaseId,
                 repo: this.context.repo.repo
             });
+        });
     }
-    async listReleases() {
+    listReleases() {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.git.repos.listReleases({
                 owner: this.context.repo.owner,
                 repo: this.context.repo.repo
             });
+        });
     }
-    async getByTag(tag) {
+    getByTag(tag) {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.git.repos.getReleaseByTag({
                 owner: this.context.repo.owner,
                 repo: this.context.repo.repo,
                 tag: tag
             });
+        });
     }
-    async update(id, tag, body, commitHash, draft, name, prerelease) {
+    update(id, tag, body, commitHash, draft, name, prerelease) {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.git.repos.updateRelease({
                 release_id: id,
                 body: body,
@@ -56,8 +76,10 @@ class GithubReleases {
                 target_commitish: commitHash,
                 tag_name: tag
             });
+        });
     }
-    async uploadArtifact(assetUrl, contentLength, contentType, file, name) {
+    uploadArtifact(assetUrl, contentLength, contentType, file, name) {
+        return __awaiter(this, void 0, void 0, function* () {
             return this.git.repos.uploadReleaseAsset({
                 url: assetUrl,
                 headers: {
@@ -67,6 +89,7 @@ class GithubReleases {
                 file: file,
                 name: name
             });
+        });
     }
 }
 exports.GithubReleases = GithubReleases;

node_modules/.yarn-integrity

@@ -1,5 +1,5 @@
 {
-  "systemParams": "darwin-x64-79",
+  "systemParams": "darwin-x64-72",
   "modulesFolders": [
     "node_modules"
   ],
@@ -646,36 +646,11 @@
   "files": [],
   "artifacts": {
     "fsevents@1.2.9": [
-      "build",
+      "lib",
-      "build/.target.mk",
+      "lib/binding",
-      "build/Makefile",
-      "build/Release",
-      "build/Release/.deps",
-      "build/Release/.deps/Release",
-      "build/Release/.deps/Release/.node.d",
-      "build/Release/.deps/Release/fse.node.d",
-      "build/Release/.deps/Release/obj.target",
-      "build/Release/.deps/Release/obj.target/action_after_build.stamp.d",
-      "build/Release/.deps/Release/obj.target/fse",
-      "build/Release/.deps/Release/obj.target/fse/fsevents.o.d",
-      "build/Release/.deps/Users",
-      "build/Release/.deps/Users/nickcipollo",
-      "build/Release/.deps/Users/nickcipollo/src",
-      "build/Release/.deps/Users/nickcipollo/src/release-action",
-      "build/Release/.node",
-      "build/Release/fse.node",
-      "build/Release/obj.target",
-      "build/Release/obj.target/action_after_build.stamp",
-      "build/Release/obj.target/fse",
-      "build/Release/obj.target/fse/fsevents.o",
-      "build/action_after_build.target.mk",
-      "build/binding.Makefile",
-      "build/config.gypi",
-      "build/fse.target.mk",
-      "build/gyp-mac-tool",
       "lib/binding/Release",
-      "lib/binding/Release/node-v79-darwin-x64",
+      "lib/binding/Release/node-v72-darwin-x64",
-      "lib/binding/Release/node-v79-darwin-x64/fse.node"
+      "lib/binding/Release/node-v72-darwin-x64/fse.node"
     ]
   }
 }

src/ArtifactUploader.ts

@@ -2,16 +2,19 @@ import * as core from '@actions/core';
 import { Artifact } from "./Artifact";
 import { Releases } from "./Releases";
 import { ReposListAssetsForReleaseResponseItem } from "@octokit/rest";
+import { ErrorMessage } from './ErrorMessage';
 
 export interface ArtifactUploader {
     uploadArtifacts(artifacts: Artifact[], releaseId: number, uploadUrl: string): Promise<void>
 }
 
 export class GithubArtifactUploader implements ArtifactUploader {
-    constructor(
+    private releases: Releases
-        private releases: Releases,
+    private replacesExistingArtifacts: boolean = true
-        private replacesExistingArtifacts: boolean = true,
+
-    ) {
+    constructor(releases: Releases, replacesExistingArtifacts: boolean) {
+        this.releases = releases
+        this.replacesExistingArtifacts = replacesExistingArtifacts
     }
 
     async uploadArtifacts(artifacts: Artifact[],
@@ -20,40 +23,32 @@ export class GithubArtifactUploader implements ArtifactUploader {
         if(this.replacesExistingArtifacts)  {
             await this.deleteUpdatedArtifacts(artifacts, releaseId)
         }
-        for (const artifact of artifacts) {
-            await this.uploadArtifact(artifact, uploadUrl)
-        }
-    }
 
-    private async uploadArtifact(artifact: Artifact, uploadUrl: string, retry = 3) {
+        for (const artifact of artifacts) {
             try {
-            core.debug(`Uploading artifact ${artifact.name}...`)
                 await this.releases.uploadArtifact(uploadUrl,
                     artifact.contentLength,
                     artifact.contentType,
                     artifact.readFile(),
                     artifact.name)
             } catch (error) {
-            if (error.status >= 500 && retry > 0) {
+                const message = `Failed to upload artifact ${artifact.name}. Does it already exist?`
-                core.warning(`Failed to upload artifact ${artifact.name}. ${error.message}. Retrying...`)
+                core.warning(message)
-                await this.uploadArtifact(artifact, uploadUrl, retry - 1)
-            } else {
-                core.warning(`Failed to upload artifact ${artifact.name}. ${error.message}.`)
             }
         }
+        return Promise.resolve()
     }
 
-    private async deleteUpdatedArtifacts(artifacts: Artifact[], releaseId: number): Promise<void> {
+    async deleteUpdatedArtifacts(artifacts: Artifact[], releaseId: number) {
         const response = await this.releases.listArtifactsForRelease(releaseId)
         const releaseAssets = response.data
-        const assetByName: Record<string, ReposListAssetsForReleaseResponseItem> = {}
+        const assetByName = new Map<string, ReposListAssetsForReleaseResponseItem>()
         releaseAssets.forEach(asset => {
             assetByName[asset.name] = asset
         });
         for (const artifact of artifacts) {
             const asset = assetByName[artifact.name]
             if (asset) {
-                core.debug(`Deleting existing artifact ${artifact.name}...`)
                 await this.releases.deleteArtifact(asset.id)
             }
         }

tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es2019",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
     "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */