Skip to content

Fix release workflow branch handling and add GitHub App token - #4929

Merged
singholt merged 1 commit into
devfrom
singholt-patch-3
Apr 14, 2026
Merged

singholt merged 1 commit into
devfrom
singholt-patch-3

Conversation

@singholt

@singholt singholt commented Apr 13, 2026

Copy link
Copy Markdown
Contributor

Summary

Fixes branch-related failures in the create-release-pr workflow and switches PR creation to use a GitHub App token.

Implementation details

Workflow (create-release-pr.yml):

  • Replace git fetch origin dev:dev with git fetch origin to avoid fatal: refusing to fetch into branch errors when a local branch is already checked out
  • Create staging branch from current HEAD instead of origin/dev, so the workflow uses whichever branch is selected in the GitHub UI (releasers should select dev)
  • Add GitHub App token generation step for PR creation, replacing ECS_AGENT_WORKFLOW_SECRET, similar to the setup in the ecs-ami repo: aws/amazon-ecs-ami@4d0038e

Changelog script (generate-release-changelog.sh):

  • Use origin/master and origin/dev remote tracking refs instead of local branch names, since local branches may not exist in CI
  • Remove 2>/dev/null from git log so errors are visible in CI logs

Testing

Ran GH action using the base branch of this PR, and generated the following dummy release PR: #4930

Description for the changelog

Housekeeping - Update release GH action

Licensing

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@singholt
singholt requested a review from a team as a code owner April 13, 2026 23:52
@singholt

Copy link
Copy Markdown
Contributor Author

Will skip functional/integ test checks

@singholt
singholt force-pushed the singholt-patch-3 branch 6 times, most recently from fb9e07e to f5b55bd Compare April 14, 2026 16:45
- Use 'git fetch origin' instead of 'git fetch origin dev:dev' to avoid
  errors when a local branch already exists or is checked out
- Create staging branch from current HEAD instead of origin/dev, allowing
  the workflow to use whichever branch is selected in the GitHub UI
- Use origin/master and origin/dev remote refs in changelog script instead
  of local branch names
- Remove stderr suppression in changelog script for easier debugging
- Add GitHub App token generation for PR creation
@singholt singholt changed the title Integrate GitHub App token generation in workflow Fix release workflow branch handling and add GitHub App token Apr 14, 2026
@singholt
singholt merged commit cce3d2f into dev Apr 14, 2026
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants