Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ Aztec is offering grants to people and teams that want to use, test or build Noi

## Full-time Contributors

Aztec is hiring a wide variety of software engineers, so if you would like to work on Noir full-time consider applying for an [open role](https://aztec.network/careers).
Aztec is hiring a wide variety of software engineers, so if you would like to work on Noir full-time consider applying for an [open role](https://aztec-labs.com/jobs).
16 changes: 8 additions & 8 deletions scripts/redo-typo-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ AUTHOR=`gh pr view $ORIGINAL_PR_NUMBER --json author --jq '.author.login'`

# Step 1: Checkout the PR locally
echo "Checking out PR #$ORIGINAL_PR_NUMBER"
gh pr checkout $ORIGINAL_PR_NUMBER
gh pr checkout $ORIGINAL_PR_NUMBER --branch "typo-pr-branch"

# Step 2: Create a new local branch
# Step 2: Create squash commit on master
echo "Squashing PR branch onto master"
git checkout master
git merge "typo-pr-branch" --squash

# Step 3: Commit squash commit to new branch
echo "Creating new local branch $NEW_BRANCH"
git checkout -b $NEW_BRANCH

# Step 3: Squash commits
echo "Squashing new local branch $NEW_BRANCH"
git reset --soft master
git add .
git commit -m "chore: typo fixes"
git commit -a -m "chore: redo typo PR"

# Step 4: Push the new branch to GitHub
echo "Pushing new branch $NEW_BRANCH to GitHub"
Expand Down
Loading