diff --git a/.github/scripts/create-release-pr.sh b/.github/scripts/create-release-pr.sh index c0523b242b7..85d7cf2f71c 100755 --- a/.github/scripts/create-release-pr.sh +++ b/.github/scripts/create-release-pr.sh @@ -4,8 +4,9 @@ set -e set -u set -o pipefail -NEW_VERSION="${1}" -RELEASE_BRANCH_PREFIX="release/" +PREVIOUS_VERSION="${1}" +NEW_VERSION="${2}" +RELEASE_BRANCH_PREFIX="test-release/" if [[ -z $NEW_VERSION ]]; then echo "Error: No new version specified." @@ -33,3 +34,11 @@ gh pr create \ --title "${NEW_VERSION}" \ --body "${RELEASE_BODY}" \ --head "${RELEASE_BRANCH_NAME}"; + +node ./generate-rc-commits.mjs "${PREVIOUS_VERSION}" "${RELEASE_BRANCH_NAME}" + +./changelog-csv.sh + +git commit -am "updated changelog and generated feature test plan" + +git push "${RELEASE_BRANCH_NAME}" \ No newline at end of file diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index b77a04b3688..c0c9a49ed41 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -52,11 +52,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - ./scripts/create-release-pr.sh ${{ github.event.inputs.semver-version }} - - name: Create Changelog - id: create-changelog - shell: bash - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - node ./scripts/generate-rc-commits.js v7.24.0 ${{ github.event.inputs.semver-version }} && ./scripts/changelog-csv.sh \ No newline at end of file + ./scripts/create-release-pr.sh ${{ github.event.inputs.previous-version-tag }} ${{ github.event.inputs.semver-version }} \ No newline at end of file