Skip to content

chore: update action secrets + bot info #4878

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

Merged
merged 3 commits into from
May 10, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
env:
# gh cli uses these env vars for owner/repo/token
GH_REPO: "npm/benchmarks"
GITHUB_TOKEN: ${{ secrets.NPM_BENCHMARKS_TOKEN }}
GITHUB_TOKEN: ${{ secrets.BENCHMARKS_DISPATCH_TOKEN }}
run: |
if [[ "$GITHUB_TOKEN" == "" ]]; then
echo "No auth - from fork pull request, exiting"
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
github.event_name == 'issue_comment' &&
github.event.issue.pull_request &&
github.event.issue.state == 'open' &&
startsWith(github.event.comment.body, '@npm-robot benchmark this')
startsWith(github.event.comment.body, '@npm-cli-bot benchmark this')
env:
# gh cli uses this env var as the token
GITHUB_TOKEN: ${{ secrets.NPM_BENCHMARKS_TOKEN }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/create-cli-deps-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ jobs:
fetch-depth: 0
ref: master
repository: npm/node
token: ${{ secrets.NPM_ROBOT_USER_PAT }}
token: ${{ secrets.NODE_PULL_REQUEST_TOKEN }}
- name: Setup git user
run: |
git config --global user.email "npm team"
git config --global user.name "ops+robot@npmjs.com"
git config --global user.email "npm CLI robot"
git config --global user.name "npm-cli+bot@github.com"
- name: Sync upstream changes
uses: aormsby/[email protected]
with:
target_sync_branch: master
target_repo_token: ${{ secrets.NPM_ROBOT_USER_PAT }}
target_repo_token: ${{ secrets.NODE_PULL_REQUEST_TOKEN }}
upstream_sync_branch: master
upstream_sync_repo: nodejs/node
upstream_pull_args: --ff-only
- name: Run dependency updates and create PR
env:
GITHUB_TOKEN: ${{ secrets.NPM_ROBOT_USER_PAT }}
GITHUB_TOKEN: ${{ secrets.NODE_PULL_REQUEST_TOKEN }}
run: |
base_dir="$( pwd )"/
dry_run="${{ github.event.inputs.dryRun }}"
Expand Down
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Michael Hayes <[email protected]> <[email protected]>
Misha Kaletsky <[email protected]>
Nicolas Morel <[email protected]>
npm team <[email protected]> <[email protected]>
npm CLI robot <[email protected]>
Olivier Melcher <[email protected]>
Ra'Shaun Stovall <[email protected]>
Rebecca Turner <[email protected]> <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-authors.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

git log --use-mailmap --reverse --format='%aN <%aE>' | grep -v "\[bot\]" | grep -v "^npm team" | perl -wnE '
git log --use-mailmap --reverse --format='%aN <%aE>' | grep -v -e "\[bot\]" -e "^npm team" -e "^npm CLI robot" | perl -wnE '
BEGIN {
say "# Authors sorted by whether or not they\x27re me";
}
Expand Down