forked from openedx/frontend-app-learning
-
Notifications
You must be signed in to change notification settings - Fork 3
feat: action for cherry-picking from openedx #23
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
Open
jansenk
wants to merge
3
commits into
release-teak
Choose a base branch
from
jkantor/cherry-pick2
base: release-teak
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.
Open
Changes from 1 commit
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| name: cherry-pick target commit from openedx repo into fork | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| targetCommitHash: | ||
| description: 'Hash of the target commit to pull into the edX fork' | ||
| required: true | ||
| type: string | ||
|
|
||
| jobs: | ||
| cherry-pick: | ||
| name: Cherry pick file | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repo | ||
| uses: actions/checkout@v5 | ||
|
|
||
| - name: configure remotes | ||
| run: | | ||
| git remote add -f openedx [email protected]:openedx/frontend-app-learning.git | ||
| git remote rename origin edx | ||
|
|
||
| - name: | ||
jansenk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| run: git log -1 --remotes=openedx ${{ inputs.targetCommitHash }} | ||
|
|
||
| - name: check that commit exists and load commit info | ||
| id: commit-info | ||
| run: | | ||
| PRETTY="" | ||
| PRETTY+="hash=%h%n" | ||
| PRETTY+="commit_subject=%s%n" | ||
| PRETTY+="author_name=%an%n" | ||
| PRETTY+="author_email=%ae%n" | ||
| PRETTY+="date=%ad%n" | ||
|
|
||
| git log -1 --pretty=$PRETTY --remotes=openedx ${{ inputs.targetCommitHash }} >> $GITHUB_OUTPUT | ||
|
|
||
| - name: Cherry pick target commit onto new branch | ||
| run: | | ||
| set -e | ||
| BRANCH_NAME="${{ github.actor }}/cherry-pick-${{ steps.commit-info.outputs.hash }}" | ||
| git checkout -b $BRANCH_NAME | ||
| git cherry-pick ${{ inputs.targetCommitHash }} | ||
| git commit -m "${{ steps.commit-info.outputs.commit_subject }}" | ||
jansenk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| git push -u edx $BRANCH_NAME | ||
|
|
||
| - name: Open pull request | ||
jansenk marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| run: | | ||
| BODY="" | ||
| BODY+="This PR cherry-picks commit ${{ steps.commit-info.outputs.hash }} from the openedx repo into the edx fork.\n\n" | ||
| BODY+="\tAuthor: ${{ steps.commit-info.outputs.author_name }} <${{ steps.commit-info.outputs.author_email }}>\n" | ||
| BODY+="\tDate: ${{ steps.commit-info.outputs.date }}\n" | ||
| gh pr create --title "${{ steps.commit-info.outputs.commit_subject }}" --body $BODY | ||
jansenk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
jansenk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.