Skip to content

Commit 03eade1

Browse files
authored
INFRA-2867-Added chore prefix to PR, await for create release, remove commits.csv from changelog pr (#111)
* INFRA-2867-Added chore prefix to PR, await for create release, remove csv from changelog pr * INFRA-2867-Added release prefix to PR, await for create release, remove csv from changelog pr * INFRA-2867-Added release prefix to PR, await for create release, remove csv from changelog pr, add workflow artifact
1 parent d354252 commit 03eade1

3 files changed

Lines changed: 15 additions & 8 deletions

File tree

.github/scripts/create-platform-release-pr.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -349,16 +349,14 @@ create_changelog_pr() {
349349
# fi
350350
cd ../
351351

352-
# Commit and Push Changelog Changes
352+
# Commit and Push Changelog Changes (exclude commits.csv)
353353
echo "Adding and committing changes.."
354-
git add ./commits.csv
355-
356-
if ! (git commit -am "updated changelog and generated feature test plan"); then
354+
if ! (git commit -am "update changelog for ${new_version}"); then
357355
echo "Error: No changes detected."
358356
exit 1
359357
fi
360358

361-
local pr_body="This PR updates the change log for ${new_version} and generates the test plan here [commit.csv](${GITHUB_REPOSITORY_URL}/blob/${changelog_branch_name}/commits.csv)"
359+
local pr_body="This PR updates the change log for ${new_version}."
362360

363361
# Use helper functions for push and PR creation
364362
push_branch_with_handling "${changelog_branch_name}"
@@ -394,7 +392,7 @@ create_version_bump_pr() {
394392
if git diff --staged --quiet; then
395393
echo "No changes to commit for version bump"
396394
else
397-
git commit -m "Bump version to ${next_version} after release ${new_version}
395+
git commit -m "release: Bump version to ${next_version} after release ${new_version}
398396
399397
This automated version bump ensures that:
400398
- ${main_branch} branch version is ahead of the release branch
@@ -435,7 +433,7 @@ This PR should be **manually reviewed and merged by the release manager** to mai
435433

436434
# Use helper functions for push and PR creation
437435
push_branch_with_handling "${version_bump_branch_name}"
438-
create_pr_if_not_exists "${version_bump_branch_name}" "Bump ${main_branch} version to ${next_version}" "${version_bump_body}" "${main_branch}" "" "head"
436+
create_pr_if_not_exists "${version_bump_branch_name}" "release: Bump ${main_branch} version to ${next_version}" "${version_bump_body}" "${main_branch}" "" "head"
439437

440438
echo "Version bump PR ready"
441439
}

.github/scripts/update-release-sheet.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ async function main() {
310310
extensionTemplateSheetId,
311311
);
312312

313-
createReleaseSheet(
313+
await createReleaseSheet(
314314
documentId,
315315
platform,
316316
semanticVersion,

.github/workflows/create-release-pr.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,12 @@ jobs:
145145
${{ inputs.mobile-build-version }} \
146146
${{ inputs.git-user-name }} \
147147
${{ inputs.git-user-email }}
148+
149+
# Step 6: Upload commits.csv as artifact (if generated)
150+
- name: Upload commits.csv artifact
151+
if: ${{ hashFiles('commits.csv') != '' }}
152+
uses: actions/upload-artifact@v4
153+
with:
154+
name: commits-csv
155+
path: commits.csv
156+
if-no-files-found: error

0 commit comments

Comments
 (0)