diff options
author | Gar <gar+gh@danger.computer> | 2022-06-22 23:56:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-22 23:56:25 +0300 |
commit | aab4079e810c06ff5fa847cbd53b5d7bab3dd24f (patch) | |
tree | 6e9aaa1062034632a904527780e06baf4826adfc | |
parent | facba42bcd2a10722788f44de13ea46cde6c8e71 (diff) |
chore: rename node branches (#5028)
Both nodejs and npm branches are now "main"
-rw-r--r-- | .github/workflows/create-cli-deps-pr.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/create-cli-deps-pr.yml b/.github/workflows/create-cli-deps-pr.yml index 595bc64ac..e0fd97fa2 100644 --- a/.github/workflows/create-cli-deps-pr.yml +++ b/.github/workflows/create-cli-deps-pr.yml @@ -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 @@ -29,9 +29,9 @@ jobs: - name: Sync upstream changes uses: aormsby/Fork-Sync-With-Upstream-action@v3.2 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 @@ -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" @@ -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 |