-
Notifications
You must be signed in to change notification settings - Fork 139
feat(ci): add feature branch creation and building containers on feat/* #2998
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
nv-dmendoza
wants to merge
3
commits into
NVIDIA:main
Choose a base branch
from
nv-dmendoza:feature-branch-ci
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+88
−0
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| name: Create Feature Branch | ||
|
|
||
| on: | ||
| issue_comment: | ||
| types: | ||
| - created | ||
|
|
||
| jobs: | ||
| create-feat-branch: | ||
| if: startsWith(github.event.comment.body, '/feature-branch ') | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| issues: write | ||
| steps: | ||
| - name: Checkout main | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| ref: main | ||
| fetch-depth: 0 | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Create feature branch with empty commit | ||
| env: | ||
| COMMENT_BODY: ${{ github.event.comment.body }} | ||
| ISSUE_NUMBER: ${{ github.event.issue.number }} | ||
| ISSUE_URL: ${{ github.event.issue.html_url }} | ||
| REQUESTER: ${{ github.event.comment.user.login }} | ||
| REPOSITORY: ${{ github.repository }} | ||
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| set -euo pipefail | ||
|
|
||
| BRANCH_NAME=$(echo "${COMMENT_BODY}" | sed 's|^/feature-branch ||' | tr -d '[:space:]') | ||
|
|
||
| if [[ -z "${BRANCH_NAME}" ]]; then | ||
| echo "No branch name provided" | ||
| exit 1 | ||
| fi | ||
|
|
||
| FULL_BRANCH="feat/${BRANCH_NAME}" | ||
|
|
||
| git config user.name "github-actions[bot]" | ||
| git config user.email "github-actions[bot]@users.noreply.github.com" | ||
|
|
||
| TAG_PREFIX=$(git describe --tags --long HEAD | sed 's/-g[0-9a-f]*$//') | ||
| FEAT_SLUG=$(echo "${FULL_BRANCH}" | tr '/' '-') | ||
| TAG="${TAG_PREFIX}-${FEAT_SLUG}" | ||
|
|
||
| git checkout -b "${FULL_BRANCH}" | ||
| COMMIT_MSG="feat: initialize ${FULL_BRANCH}" | ||
| COMMIT_MSG+=$'\n\n' | ||
| COMMIT_MSG+="Requested by @${REQUESTER} on issue #${ISSUE_NUMBER}" | ||
| git commit --allow-empty -m "${COMMIT_MSG}" | ||
|
|
||
| git tag "${TAG}" | ||
| git push origin "${FULL_BRANCH}" "${TAG}" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The current Github ruleset setting blocks GITHUB_TOKEN from creating feat/*: only repository admins and copy-pr-bot can bypass it. We may need to create a GitHub Actions App and update the ruleset to bypass the rule. |
||
|
|
||
| BRANCH_URL="https://github.com/${REPOSITORY}/tree/${FULL_BRANCH}" | ||
| COMMENT_BODY="Branch created: [${FULL_BRANCH}](${BRANCH_URL})" | ||
| COMMENT_BODY+=$'\n\n' | ||
| COMMENT_BODY+="To check out locally:" | ||
| COMMENT_BODY+=$'\n' | ||
| COMMENT_BODY+='```' | ||
| COMMENT_BODY+=$'\n' | ||
| COMMENT_BODY+="git fetch upstream && git checkout -b ${FULL_BRANCH} upstream/${FULL_BRANCH}" | ||
| COMMENT_BODY+=$'\n' | ||
| COMMENT_BODY+='```' | ||
| gh issue comment "${ISSUE_NUMBER}" --body "${COMMENT_BODY}" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to strictly validate the branch name here instead of only stripping whitespace? Git refs may contain shell special characters, and this value later becomes VERSION and is interpolated directly into run: scripts, which can lead to command injection on self-hosted runners. maybe a bounded, single-segment slug such as ^[a-z0-9]+(-[a-z0-9]+)*$ would prevent shell inject and ensure compatibility with the downstream version and Helm workflows.