diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bed335..80ff47c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,57 +65,6 @@ jobs: ...context.repo, release_id: release.data.id, }) - - name: Make test draft release - uses: ./ - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: README.md - tag: ci-test-${{ matrix.os }} - overwrite: true - draft: true - prerelease: false - release_name: "ci-test-${{ matrix.os }} release name" - body: "some other text" - - name: Check that the uploaded asset is readable - uses: actions/github-script@v2 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - // This uses a draft release and as such doesn't create its own tags. - // We're re-using the ci-test tags created by the previous execution of this action. - const fs = require('fs') - const child_process = require('child_process'); - const assert = require('assert').strict; - - const expected = fs.readFileSync("README.md") - const release = await github.repos.getReleaseByTag({ - ...context.repo, - tag: "ci-test-${{ matrix.os }}", - }) - assert.deepStrictEqual(release.data.name, "ci-test-${{ matrix.os }} release name") - assert.deepStrictEqual(release.data.draft, true) - assert.deepStrictEqual(release.data.prerelease, false) - assert.deepStrictEqual(release.data.body, "rofl lol test") - assert.deepStrictEqual(release.data.assets[0].name, "README.md") - const actual = child_process.execSync(`curl -Ls ${release.data.assets[0].browser_download_url}`) - assert.deepStrictEqual(expected, actual) - - name: Clean up - if: ${{ always() }} - uses: actions/github-script@v2 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const release = await github.repos.getReleaseByTag({ - ...context.repo, - tag: "ci-test-${{ matrix.os }}", - }) - await github.repos.deleteRelease({ - ...context.repo, - release_id: release.data.id, - }) - - // As per above, even though this particular invocation didn't create tags as it was a draft release, - // we used them from the run before and we're now cleaning them up. await github.git.deleteRef({ ...context.repo, ref: "tags/ci-test-${{ matrix.os }}", diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cd02ae..68959e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ # Changelog ## [2.0.0] - 2020-07-03 -- Add `draft` input parameter. Setting this marks the created release as a draft. - Add `prerelease` input parameter. Setting this marks the created release as a pre-release. - Add `release_name` input parameter. Setting this explicitly sets the title of the release. - Add `body` input parameter. Setting this sets the text content of the created release. diff --git a/README.md b/README.md index 0a45d0f..fc06ee3 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,6 @@ Optional Arguments This is not used if `file_glob` is set to `true`. - `file_glob`: If set to true, the file argument can be a glob pattern (`asset_name` is ignored in this case) (Default: `false`) - `overwrite`: If an asset with the same name already exists, overwrite it (Default: `false`). -- `draft`: Mark the release as a draft (Default: `false`). If this is set to `true` then the release won't receive automatically receice a name as the - Github API only matches the tag upon final release. - `prerelease`: Mark the release as a pre-release (Default: `false`). - `release_name`: Explicitly set a release name. (Defaults: implicitly same as `tag` via GitHub API). - `body`: Content of the release text (Defaut: `""`). diff --git a/action.yml b/action.yml index a5dc8b0..2383812 100644 --- a/action.yml +++ b/action.yml @@ -20,8 +20,6 @@ inputs: description: 'Overwrite the release in case it already exists.' file_glob: description: 'If true the file can be a glob pattern, asset_name is ignored if this is true.' - draft: - description: 'Mark the release as a draft. Defaults to "false".' prerelease: description: 'Mark the release as a pre-release. Defaults to "false".' release_name: diff --git a/dist/index.js b/dist/index.js index d919572..0980dd4 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2201,7 +2201,7 @@ const core = __importStar(__webpack_require__(470)); const github = __importStar(__webpack_require__(469)); const path = __importStar(__webpack_require__(622)); const glob = __importStar(__webpack_require__(402)); -function get_release_by_tag(tag, draft, prerelease, release_name, body, octokit) { +function get_release_by_tag(tag, prerelease, release_name, body, octokit) { return __awaiter(this, void 0, void 0, function* () { try { core.debug(`Getting release by tag ${tag}.`); @@ -2211,7 +2211,7 @@ function get_release_by_tag(tag, draft, prerelease, release_name, body, octokit) // If this returns 404, we need to create the release first. if (error.status === 404) { 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({}, github.context.repo), { tag_name: tag, draft: draft, prerelease: prerelease, release_name: release_name, body: body })); + return yield octokit.repos.createRelease(Object.assign(Object.assign({}, github.context.repo), { tag_name: tag, prerelease: prerelease, release_name: release_name, body: body })); } else { throw error; @@ -2266,12 +2266,11 @@ function run() { const tag = core.getInput('tag', { required: true }).replace('refs/tags/', ''); const file_glob = core.getInput('file_glob') == 'true' ? true : false; const overwrite = core.getInput('overwrite') == 'true' ? true : false; - const draft = core.getInput('draft') == 'true' ? true : false; const prerelease = core.getInput('prerelease') == 'true' ? true : false; const release_name = core.getInput('release_name'); const body = core.getInput('body'); const octokit = github.getOctokit(token); - const release = yield get_release_by_tag(tag, draft, prerelease, release_name, body, octokit); + const release = yield get_release_by_tag(tag, prerelease, release_name, body, octokit); if (file_glob) { const files = glob.sync(file); if (files.length > 0) { diff --git a/src/main.ts b/src/main.ts index abc1e27..0ec155e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -13,7 +13,6 @@ type UploadAssetResp = Endpoints['POST /repos/:owner/:repo/releases/:release_id/ async function get_release_by_tag( tag: string, - draft: boolean, prerelease: boolean, release_name: string, body: string, @@ -34,7 +33,6 @@ async function get_release_by_tag( return await octokit.repos.createRelease({ ...github.context.repo, tag_name: tag, - draft: draft, prerelease: prerelease, release_name: release_name, body: body @@ -110,7 +108,6 @@ async function run(): Promise { const file_glob = core.getInput('file_glob') == 'true' ? true : false const overwrite = core.getInput('overwrite') == 'true' ? true : false - const draft = core.getInput('draft') == 'true' ? true : false const prerelease = core.getInput('prerelease') == 'true' ? true : false const release_name = core.getInput('release_name') const body = core.getInput('body') @@ -118,7 +115,6 @@ async function run(): Promise { const octokit: Octokit = github.getOctokit(token) const release = await get_release_by_tag( tag, - draft, prerelease, release_name, body,