5 Commits

Author SHA1 Message Date
Nick Cipollo
4c75f0f2e4 v1.11.1 release
Some checks failed
Test / check_pr (push) Has been cancelled
2022-10-04 12:30:45 -04:00
Nick Cipollo
b072aaafe1 update debug build 2022-10-04 08:09:17 -04:00
Nick Cipollo
f3ea29dca7 Fixes #262 normalize artifact paths 2022-10-04 08:08:09 -04:00
Nick Cipollo
889eb279f8 Fixes #261 Correctly set default on updateOnlyUnreleased 2022-10-02 18:19:43 -04:00
Nick Cipollo
5b3ed26ce2 Fixes #219 Add argument to allow only updating drafts and prereleases 2022-10-02 17:35:42 -04:00
19 changed files with 458 additions and 226 deletions

View File

@@ -22,13 +22,14 @@ This action will create a GitHub release and optionally upload an artifact to it
| omitName | Indicates if the release name should be omitted. | false | false | | omitName | Indicates if the release name should be omitted. | false | false |
| omitNameDuringUpdate | Indicates if the release name should be omitted during updates. The name will still be applied for newly created releases. This will preserve the existing name during updates. | false | false | | omitNameDuringUpdate | Indicates if the release name should be omitted during updates. The name will still be applied for newly created releases. This will preserve the existing name during updates. | false | false |
| omitPrereleaseDuringUpdate | Indicates if the prerelease flag should be omitted during updates. The prerelease flag will still be applied for newly created releases. This will preserve the existing prerelease state during updates. | false | false | | omitPrereleaseDuringUpdate | Indicates if the prerelease flag should be omitted during updates. The prerelease flag will still be applied for newly created releases. This will preserve the existing prerelease state during updates. | false | false |
| owner | Optionally specify the owner of the repo where the release should be generated. Defaults to current repo's owner. | false | "current repo owner" | | owner | Optionally specify the owner of the repo where the release should be generated. Defaults to current repo's owner. | false | "current repo owner" |
| prerelease | Optionally marks this release as prerelease. Set to true to enable. | false | "" | | prerelease | Optionally marks this release as prerelease. Set to true to enable. | false | "" |
| removeArtifacts | Indicates if existing release artifacts should be removed. | false | false | | removeArtifacts | Indicates if existing release artifacts should be removed. | false | false |
| replacesArtifacts | Indicates if existing release artifacts should be replaced. | false | true | | replacesArtifacts | Indicates if existing release artifacts should be replaced. | false | true |
| repo | Optionally specify the repo where the release should be generated. | false | current repo | | repo | Optionally specify the repo where the release should be generated. | false | current repo |
| tag | An optional tag for the release. If this is omitted the git ref will be used (if it is a tag). | false | "" | | tag | An optional tag for the release. If this is omitted the git ref will be used (if it is a tag). | false | "" |
| token | The GitHub token. This will default to the GitHub app token. This is primarily useful if you want to use your personal token (for targeting other repos, etc). If you are using a personal access token it should have access to the `repo` scope. | false | github.token | | token | The GitHub token. This will default to the GitHub app token. This is primarily useful if you want to use your personal token (for targeting other repos, etc). If you are using a personal access token it should have access to the `repo` scope. | false | github.token |
| updateOnlyUnreleased | When allowUpdates is enabled, this will fail the action if the release it is updating is not a draft or a prerelease. | false | false |
## Action Outputs ## Action Outputs
| Output name | Description | | Output name | Description |

View File

@@ -37,6 +37,7 @@ const updateBody = 'updateBody'
const updateDraft = false const updateDraft = false
const updateName = 'updateName' const updateName = 'updateName'
const updatePrerelease = false const updatePrerelease = false
const updateOnlyUnreleased = false
const url = 'http://api.example.com' const url = 'http://api.example.com'
describe("Action", () => { describe("Action", () => {
@@ -317,7 +318,9 @@ describe("Action", () => {
expect(applyReleaseDataMock).toBeCalledWith({id: releaseId, upload_url: url}) expect(applyReleaseDataMock).toBeCalledWith({id: releaseId, upload_url: url})
} }
function createAction(allowUpdates: boolean, hasArtifact: boolean, removeArtifacts: boolean = false): Action { function createAction(allowUpdates: boolean,
hasArtifact: boolean,
removeArtifacts: boolean = false): Action {
let inputArtifact: Artifact[] let inputArtifact: Artifact[]
if (hasArtifact) { if (hasArtifact) {
inputArtifact = artifacts inputArtifact = artifacts
@@ -379,7 +382,8 @@ describe("Action", () => {
updatedDraft: updateDraft, updatedDraft: updateDraft,
updatedReleaseBody: updateBody, updatedReleaseBody: updateBody,
updatedReleaseName: updateName, updatedReleaseName: updateName,
updatedPrerelease: updatePrerelease updatedPrerelease: updatePrerelease,
updateOnlyUnreleased: updateOnlyUnreleased
} }
}) })
const MockOutputs = jest.fn<Outputs, any>(() => { const MockOutputs = jest.fn<Outputs, any>(() => {

View File

@@ -430,6 +430,17 @@ describe('Inputs', () => {
}) })
}) })
describe('updateOnlyUnreleased', () => {
it('returns false', () => {
expect(inputs.updateOnlyUnreleased).toBe(false)
})
it('returns true', () => {
mockGetInput.mockReturnValueOnce('true')
expect(inputs.updateOnlyUnreleased).toBe(true)
})
})
function createGlobber(): ArtifactGlobber { function createGlobber(): ArtifactGlobber {
const MockGlobber = jest.fn<ArtifactGlobber, any>(() => { const MockGlobber = jest.fn<ArtifactGlobber, any>(() => {
return { return {

View File

@@ -57,7 +57,8 @@ describe.skip('Integration Test', () => {
updatedDraft: false, updatedDraft: false,
updatedReleaseBody: "This release was generated by release-action's integration test", updatedReleaseBody: "This release was generated by release-action's integration test",
updatedReleaseName: "Releases Action Integration Test", updatedReleaseName: "Releases Action Integration Test",
updatedPrerelease: false updatedPrerelease: false,
updateOnlyUnreleased: false
} }
}) })
return new MockInputs(); return new MockInputs();

View File

@@ -0,0 +1,74 @@
import {ReleaseValidator} from "../src/ReleaseValidator";
describe("validateReleaseUpdate", () => {
describe("updateOnlyUnreleased is disabled", () => {
const validator = new ReleaseValidator(false)
it('should not throw', () => {
const releaseResponse = {
draft: false,
prerelease: false,
name: "Name"
}
expect(() => {
validator.validateReleaseUpdate(releaseResponse)
}).not.toThrow()
})
})
describe("updateOnlyUnreleased is enabled", () => {
const validator = new ReleaseValidator(true)
it('should throw if neither draft or prerelease are enabled', () => {
const releaseResponse = {
draft: false,
prerelease: false,
name: "Name"
}
expect(() => {
validator.validateReleaseUpdate(releaseResponse)
}).toThrow()
})
it('should not throw if draft is enabled', () => {
const releaseResponse = {
draft: true,
prerelease: false,
name: "Name"
}
expect(() => {
validator.validateReleaseUpdate(releaseResponse)
}).not.toThrow()
})
it('should not throw if prerelease is enabled', () => {
const releaseResponse = {
draft: false,
prerelease: true,
name: "Name"
}
expect(() => {
validator.validateReleaseUpdate(releaseResponse)
}).not.toThrow()
})
it('should not throw if draft & prerelease is enabled', () => {
const releaseResponse = {
draft: true,
prerelease: true,
name: "Name"
}
expect(() => {
validator.validateReleaseUpdate(releaseResponse)
}).not.toThrow()
})
it('should default error message release name to release', () => {
const releaseResponse = {
draft: false,
prerelease: false,
name: null
}
expect(() => {
validator.validateReleaseUpdate(releaseResponse)
}).toThrow(`Tried to update "release" which is neither a draft or prerelease. (updateOnlyUnreleased is on)`)
})
})
})

View File

@@ -94,7 +94,7 @@ inputs:
repo: repo:
description: "Optionally specify the repo where the release should be generated. Defaults to current repo" description: "Optionally specify the repo where the release should be generated. Defaults to current repo"
required: false required: false
default: '' default: ''
tag: tag:
description: 'An optional tag for the release. If this is omitted the git ref will be used (if it is a tag).' description: 'An optional tag for the release. If this is omitted the git ref will be used (if it is a tag).'
required: false required: false
@@ -103,6 +103,10 @@ inputs:
description: 'The Github token.' description: 'The Github token.'
required: false required: false
default: ${{ github.token }} default: ${{ github.token }}
updateOnlyUnreleased:
description: "When allowUpdates is enabled, this will fail the action if the release it is updating is not a draft or a prerelease."
required: false
default: 'false'
outputs: outputs:
id: id:
description: 'The identifier of the created release.' description: 'The identifier of the created release.'

492
dist/index.js vendored

File diff suppressed because it is too large Load Diff

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.Action = void 0; exports.Action = void 0;
const GithubError_1 = require("./GithubError"); const GithubError_1 = require("./GithubError");
const ReleaseValidator_1 = require("./ReleaseValidator");
class Action { class Action {
constructor(inputs, outputs, releases, uploader, artifactDestroyer) { constructor(inputs, outputs, releases, uploader, artifactDestroyer) {
this.inputs = inputs; this.inputs = inputs;
@@ -18,6 +19,7 @@ class Action {
this.releases = releases; this.releases = releases;
this.uploader = uploader; this.uploader = uploader;
this.artifactDestroyer = artifactDestroyer; this.artifactDestroyer = artifactDestroyer;
this.releaseValidator = new ReleaseValidator_1.ReleaseValidator(inputs.updateOnlyUnreleased);
} }
perform() { perform() {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
@@ -45,6 +47,8 @@ class Action {
catch (error) { catch (error) {
return yield this.checkForMissingReleaseError(error); return yield this.checkForMissingReleaseError(error);
} }
// Fail if this isn't an unreleased release & updateOnlyUnreleased is enabled.
this.releaseValidator.validateReleaseUpdate(getResponse.data);
return yield this.updateRelease(getResponse.data.id); return yield this.updateRelease(getResponse.data.id);
} }
else { else {

View File

@@ -32,6 +32,7 @@ const Globber_1 = require("./Globber");
const Artifact_1 = require("./Artifact"); const Artifact_1 = require("./Artifact");
const untildify_1 = __importDefault(require("untildify")); const untildify_1 = __importDefault(require("untildify"));
const ArtifactPathValidator_1 = require("./ArtifactPathValidator"); const ArtifactPathValidator_1 = require("./ArtifactPathValidator");
const PathNormalizer_1 = require("./PathNormalizer");
class FileArtifactGlobber { class FileArtifactGlobber {
constructor(globber = new Globber_1.FileGlobber()) { constructor(globber = new Globber_1.FileGlobber()) {
this.globber = globber; this.globber = globber;
@@ -40,6 +41,7 @@ class FileArtifactGlobber {
const split = /[,\n]/; const split = /[,\n]/;
return artifact.split(split) return artifact.split(split)
.map(path => path.trimStart()) .map(path => path.trimStart())
.map(path => PathNormalizer_1.PathNormalizer.normalizePath(path))
.map(path => FileArtifactGlobber.expandPath(path)) .map(path => FileArtifactGlobber.expandPath(path))
.map(pattern => this.globPattern(pattern, errorsFailBuild)) .map(pattern => this.globPattern(pattern, errorsFailBuild))
.map((globResult) => FileArtifactGlobber.validatePattern(errorsFailBuild, globResult[1], globResult[0])) .map((globResult) => FileArtifactGlobber.validatePattern(errorsFailBuild, globResult[1], globResult[0]))

View File

@@ -180,6 +180,9 @@ class CoreInputs {
return undefined; return undefined;
return this.name; return this.name;
} }
get updateOnlyUnreleased() {
return core.getInput('updateOnlyUnreleased') == 'true';
}
static get omitNameDuringUpdate() { static get omitNameDuringUpdate() {
return core.getInput('omitNameDuringUpdate') == 'true'; return core.getInput('omitNameDuringUpdate') == 'true';
} }

13
lib/PathNormalizer.js Normal file
View File

@@ -0,0 +1,13 @@
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.PathNormalizer = void 0;
const path_1 = __importDefault(require("path"));
class PathNormalizer {
static normalizePath(pathString) {
return pathString.split(path_1.default.sep).join("/");
}
}
exports.PathNormalizer = PathNormalizer;

18
lib/ReleaseValidator.js Normal file
View File

@@ -0,0 +1,18 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.ReleaseValidator = void 0;
class ReleaseValidator {
constructor(updateOnlyUnreleased) {
this.updateOnlyUnreleased = updateOnlyUnreleased;
}
validateReleaseUpdate(releaseResponse) {
var _a;
if (!this.updateOnlyUnreleased) {
return;
}
if (!releaseResponse.draft && !releaseResponse.prerelease) {
throw new Error(`Tried to update "${(_a = releaseResponse.name) !== null && _a !== void 0 ? _a : "release"}" which is neither a draft or prerelease. (updateOnlyUnreleased is on)`);
}
}
}
exports.ReleaseValidator = ReleaseValidator;

View File

@@ -10,13 +10,16 @@ import {ArtifactUploader} from "./ArtifactUploader";
import {GithubError} from "./GithubError"; import {GithubError} from "./GithubError";
import {Outputs} from "./Outputs"; import {Outputs} from "./Outputs";
import {ArtifactDestroyer} from "./ArtifactDestroyer"; import {ArtifactDestroyer} from "./ArtifactDestroyer";
import {ReleaseValidator} from "./ReleaseValidator";
export class Action { export class Action {
private inputs: Inputs private inputs: Inputs
private outputs: Outputs private outputs: Outputs
private releases: Releases private releases: Releases
private artifactDestroyer: ArtifactDestroyer
private uploader: ArtifactUploader private uploader: ArtifactUploader
private artifactDestroyer: ArtifactDestroyer
private releaseValidator: ReleaseValidator
constructor(inputs: Inputs, constructor(inputs: Inputs,
outputs: Outputs, outputs: Outputs,
@@ -28,6 +31,7 @@ export class Action {
this.releases = releases this.releases = releases
this.uploader = uploader this.uploader = uploader
this.artifactDestroyer = artifactDestroyer this.artifactDestroyer = artifactDestroyer
this.releaseValidator = new ReleaseValidator(inputs.updateOnlyUnreleased)
} }
async perform() { async perform() {
@@ -56,6 +60,9 @@ export class Action {
} catch (error: any) { } catch (error: any) {
return await this.checkForMissingReleaseError(error) return await this.checkForMissingReleaseError(error)
} }
// Fail if this isn't an unreleased release & updateOnlyUnreleased is enabled.
this.releaseValidator.validateReleaseUpdate(getResponse.data)
return await this.updateRelease(getResponse.data.id) return await this.updateRelease(getResponse.data.id)
} else { } else {

View File

@@ -3,6 +3,7 @@ import {Globber, FileGlobber} from "./Globber";
import {Artifact} from "./Artifact"; import {Artifact} from "./Artifact";
import untildify from "untildify"; import untildify from "untildify";
import {ArtifactPathValidator} from "./ArtifactPathValidator"; import {ArtifactPathValidator} from "./ArtifactPathValidator";
import {PathNormalizer} from "./PathNormalizer";
export interface ArtifactGlobber { export interface ArtifactGlobber {
globArtifactString(artifact: string, contentType: string, errorsFailBuild: boolean): Artifact[] globArtifactString(artifact: string, contentType: string, errorsFailBuild: boolean): Artifact[]
@@ -19,6 +20,7 @@ export class FileArtifactGlobber implements ArtifactGlobber {
const split = /[,\n]/ const split = /[,\n]/
return artifact.split(split) return artifact.split(split)
.map(path => path.trimStart()) .map(path => path.trimStart())
.map(path => PathNormalizer.normalizePath(path))
.map(path => FileArtifactGlobber.expandPath(path)) .map(path => FileArtifactGlobber.expandPath(path))
.map(pattern => this.globPattern(pattern, errorsFailBuild)) .map(pattern => this.globPattern(pattern, errorsFailBuild))
.map((globResult) => FileArtifactGlobber.validatePattern(errorsFailBuild, globResult[1], globResult[0])) .map((globResult) => FileArtifactGlobber.validatePattern(errorsFailBuild, globResult[1], globResult[0]))

View File

@@ -25,6 +25,7 @@ export interface Inputs {
readonly updatedReleaseBody?: string readonly updatedReleaseBody?: string
readonly updatedReleaseName?: string readonly updatedReleaseName?: string
readonly updatedPrerelease?: boolean readonly updatedPrerelease?: boolean
readonly updateOnlyUnreleased: boolean
} }
export class CoreInputs implements Inputs { export class CoreInputs implements Inputs {
@@ -209,6 +210,10 @@ export class CoreInputs implements Inputs {
if (CoreInputs.omitName || CoreInputs.omitNameDuringUpdate) return undefined if (CoreInputs.omitName || CoreInputs.omitNameDuringUpdate) return undefined
return this.name return this.name
} }
get updateOnlyUnreleased(): boolean {
return core.getInput('updateOnlyUnreleased') == 'true'
}
private static get omitNameDuringUpdate(): boolean { private static get omitNameDuringUpdate(): boolean {
return core.getInput('omitNameDuringUpdate') == 'true' return core.getInput('omitNameDuringUpdate') == 'true'

7
src/PathNormalizer.ts Normal file
View File

@@ -0,0 +1,7 @@
import path from "path";
export class PathNormalizer {
static normalizePath(pathString: string): string {
return pathString.split(path.sep).join("/")
}
}

20
src/ReleaseValidator.ts Normal file
View File

@@ -0,0 +1,20 @@
export class ReleaseValidator {
constructor(private updateOnlyUnreleased: boolean) {
}
validateReleaseUpdate(releaseResponse: ReleaseStageArguments) {
if (!this.updateOnlyUnreleased) {
return
}
if (!releaseResponse.draft && !releaseResponse.prerelease) {
throw new Error(`Tried to update "${releaseResponse.name ?? "release"}" which is neither a draft or prerelease. (updateOnlyUnreleased is on)`)
}
}
}
export type ReleaseStageArguments = {
draft: boolean
name: string | null
prerelease: boolean
}