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.

Sign up for GitHub

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

chore: rename node branches #5028

Merged
merged 1 commit into from
Jun 22, 2022
Merged

chore: rename node branches #5028

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .github/workflows/create-cli-deps-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: master
ref: main
repository: npm/node
token: ${{ secrets.NODE_PULL_REQUEST_TOKEN }}
- name: Setup git user
Expand All @@ -29,9 +29,9 @@ jobs:
- name: Sync upstream changes
uses: aormsby/[email protected]
with:
target_sync_branch: master
target_sync_branch: main
target_repo_token: ${{ secrets.NODE_PULL_REQUEST_TOKEN }}
upstream_sync_branch: master
upstream_sync_branch: main
upstream_sync_repo: nodejs/node
upstream_pull_args: --ff-only
- name: Run dependency updates and create PR
Expand All @@ -46,7 +46,7 @@ jobs:

if [ "$npm_version" == "latest" ]; then
npm_tag=`npm view npm@latest version`
base_branch="master"
base_branch="main"
else
npm_tag="$npm_version"
base_branch="v14.x-staging"
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:

git add -A deps/npm
git commit -m "$message"
git rebase --whitespace=fix master
git rebase --whitespace=fix main

if [[ "$dry_run" == "true" ]]; then
git status
Expand Down