diff --git a/script/release/ci-release-build.js b/script/release/ci-release-build.js index 2401cd0ecd..207be62225 100644 --- a/script/release/ci-release-build.js +++ b/script/release/ci-release-build.js @@ -93,7 +93,7 @@ async function githubActionsCall (targetBranch, workflowName, options) { } await octokit.request(`POST ${GH_ACTIONS_API_URL}/workflows/${workflowName}.yml/dispatches`, { - ref: buildRequest.branch, + ref: `refs/tags/${options.newVersion}`, inputs: { ...buildRequest.parameters }, diff --git a/script/release/prepare-release.js b/script/release/prepare-release.js index c84580e4bf..25e2c7490c 100755 --- a/script/release/prepare-release.js +++ b/script/release/prepare-release.js @@ -158,9 +158,10 @@ async function pushRelease (branch) { } } -async function runReleaseBuilds (branch) { +async function runReleaseBuilds (branch, newVersion) { await ciReleaseBuild(branch, { - ghRelease: true + ghRelease: true, + newVersion }); } @@ -190,6 +191,8 @@ async function verifyNewVersion () { console.log(`${fail} Aborting release of ${newVersion}`); process.exit(); } + + return newVersion; } async function promptForVersion (version) { @@ -225,10 +228,10 @@ async function prepareRelease (isBeta, notesOnly) { } else { const changes = await changesToRelease(); if (changes) { - await verifyNewVersion(); + const newVersion = await verifyNewVersion(); await createRelease(currentBranch, isBeta); await pushRelease(currentBranch); - await runReleaseBuilds(currentBranch); + await runReleaseBuilds(currentBranch, newVersion); } else { console.log('There are no new changes to this branch since the last release, aborting release.'); process.exit(1);