Skip to content
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

fix: cherry pick PR improvement #7793

Merged
merged 28 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
59443db
update checkout version
sethkfman Oct 31, 2023
9dba066
updated workflow to include checkout and nvm init command
sethkfman Oct 31, 2023
0680ac5
formatting update
sethkfman Oct 31, 2023
72fe077
Updated workflow to checkout main before running script
sethkfman Nov 1, 2023
465ead9
updated action for debugging
sethkfman Nov 7, 2023
a3d098d
added a fetch
sethkfman Nov 13, 2023
14bceb8
added echo
sethkfman Nov 13, 2023
977c097
added fetch depth
sethkfman Nov 13, 2023
1b44920
removed fetch statements
sethkfman Nov 14, 2023
3db4763
added name
sethkfman Nov 14, 2023
b6a23b4
fixed formated
sethkfman Nov 14, 2023
59b1ef8
fix formatting
sethkfman Nov 14, 2023
2a8b303
yml formatting
sethkfman Nov 14, 2023
8aa0dbc
formatting
sethkfman Nov 14, 2023
4c7db1a
update PR create function
sethkfman Nov 15, 2023
60161f7
Merge branch 'main' into fix/cherry-pick-node-version
sethkfman Nov 16, 2023
779d157
update pr create script
sethkfman Nov 16, 2023
3f3d936
update script with echo
sethkfman Nov 16, 2023
9fe75f3
checkout code location
metamaskbot Nov 20, 2023
db0e499
remove checkout action and node version
sethkfman Jan 17, 2024
d711905
add node
sethkfman Jan 17, 2024
2d99ce2
add checkout
sethkfman Jan 17, 2024
a7c51b2
add node
sethkfman Jan 17, 2024
317c6ac
add logging
sethkfman Jan 17, 2024
f28e8c0
added source variable
sethkfman Jan 17, 2024
c10fefb
remove logs
sethkfman Jan 17, 2024
953dbfe
Merge branch 'main' into fix/cherry-pick-node-version
sethkfman Jan 17, 2024
66a80b9
added ref
sethkfman Jan 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions .github/workflows/create-cherry-pick-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,28 @@ on:
PR_number:
description: 'PR # Associated with Cherry Pick'
required: true


jobs:
cherry-pick:
runs-on: ubuntu-latest

permissions:
contents: write
pull-requests: write
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Create Cherry Pick PR
id: create-cherry-pick-pr
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
./scripts/create-cherry-pick-pr.sh ${{ github.event.inputs.branch_name }} ${{ github.event.inputs.commit_hash }} ${{ github.event.inputs.PR_number }}
- uses: actions/checkout@v3
with:
ref: ${{ vars.GITHUB_REF }}
fetch-depth: 0
token: ${{ secrets.BUG_REPORT_TOKEN }}
- name: Get Node.js version
id: nvm
run: echo "NODE_VERSION=$(cat .nvmrc)" >> "$GITHUB_OUTPUT"
- uses: actions/setup-node@v3
with:
node-version: ${{ steps.nvm.outputs.NODE_VERSION }}
- name: Create Cherry Pick PR
id: create-cherry-pick-pr
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
./scripts/create-cherry-pick-pr.sh ${{ github.event.inputs.branch_name }} ${{ github.event.inputs.commit_hash }} ${{ github.event.inputs.PR_number }}
3 changes: 2 additions & 1 deletion scripts/create-cherry-pick-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ gh pr create \
--draft \
--title "${PR_TITLE}" \
--body "${PR_BODY}" \
--head "${BASE_PR_BRANCH_NAME}"
--head "${PR_BRANCH_NAME}" \
--base "${BASE_PR_BRANCH_NAME}"
Loading