From 43ecf6ce5f759b2e71a40dd001fd4324860ae2e6 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Mon, 14 Oct 2019 18:52:24 -0400 Subject: [PATCH] chore(release): update target branch to current branch for release tag --- .scripts/release.js | 8 +++++++- core/package.json | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.scripts/release.js b/.scripts/release.js index 4c49149518..105c277eff 100644 --- a/.scripts/release.js +++ b/.scripts/release.js @@ -122,10 +122,16 @@ async function publishGithub(version, tag, changelog) { token: process.env.GH_TOKEN }); + let branch = await execa.stdout('git', ['symbolic-ref', '--short', 'HEAD']); + + if (!branch) { + branch = 'master'; + } + await octokit.repos.createRelease({ owner: 'ionic-team', repo: 'ionic', - target_commitish: 'master', + target_commitish: branch, tag_name: tag, name: version, body: changelog, diff --git a/core/package.json b/core/package.json index b394e2f008..5cba279ea8 100644 --- a/core/package.json +++ b/core/package.json @@ -66,7 +66,6 @@ "build.css": "npm run css.sass && npm run css.minify", "build.debug": "npm run clean && stencil build --debug", "build.docs.json": "stencil build --docs-json dist/docs.json", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", "clean": "node scripts/clean.js", "cdnloader": "node scripts/copy-cdn-loader.js", "css.minify": "cleancss -O2 -o ./css/ionic.bundle.css ./css/ionic.bundle.css",