Skip to content

Commit

Permalink
Merge pull request #1638 from hubotio/switch-to-main
Browse files Browse the repository at this point in the history
fix: Renaming from master to main
  • Loading branch information
joeyguerra committed Jun 10, 2023
2 parents 37fb0b8 + d68514e commit 62474fc
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ staleLabel: stale
# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has [not had
recent activity](https://github.com/github/hubot/blob/master/CONTRIBUTING.md#stale-issue-and-pull-request-policy).
recent activity](https://github.com/github/hubot/blob/main/CONTRIBUTING.md#stale-issue-and-pull-request-policy).
It will be closed if no further activity occurs. Thank you for your contributions.
# Comment to post when removing the stale label. Set to `false` to disable
unmarkComment: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Node.js (macOS) CI

on:
push:
branches: [ "master" ]
branches: [ "main" ]
schedule:
- cron: '5 4 * * 0'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nodejs-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Node.js (Ubuntu) CI

on:
push:
branches: [ "master" ]
branches: [ "main" ]
pull_request:
branches: [ "master" ]
branches: [ "main" ]
schedule:
- cron: '5 4 * * 0'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Node.js (Windows) CI

on:
push:
branches: [ "master" ]
branches: [ "main" ]
schedule:
- cron: '5 4 * * 0'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release
on:
push:
branches:
- master
- main
permissions:
contents: read
jobs:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ No matter how you want to get involved, we ask that you first learn what’s exp
We love pull requests. Here's a quick guide:

1. If you're adding a new feature or changing user-facing APIs, check out the [Hubot Evolution](https://github.com/hubotio/evolution) process.
1. Check for [existing issues](https://github.com/github/hubot/issues) for duplicates and confirm that it hasn't been fixed already in the [master branch](https://github.com/github/hubot/commits/master)
1. Check for [existing issues](https://github.com/github/hubot/issues) for duplicates and confirm that it hasn't been fixed already in the [main branch](https://github.com/github/hubot/commits/main)
1. Fork the repo, and clone it locally
1. `npm link` to make your cloned repo available to npm
1. Follow [Getting Started](docs/index.md) to generate a testbot
Expand Down Expand Up @@ -55,7 +55,7 @@ The goal of this process is to keep the list of open issues and pull requests fo

# Pull Request Reviews & releasing

Releasing `hubot` is fully automated using [semantic-release](https://github.com/semantic-release/semantic-release). Once merged into the `master` branch, `semantic-release` will automatically release a new version based on the commit messages of the pull request. For it to work correctly, make sure that the correct commit message conventions have been used. The ones relevant are
Releasing `hubot` is fully automated using [semantic-release](https://github.com/semantic-release/semantic-release). Once merged into the `main` branch, `semantic-release` will automatically release a new version based on the commit messages of the pull request. For it to work correctly, make sure that the correct commit message conventions have been used. The ones relevant are

* `fix: …` will bump the fix version, e.g. 1.2.3 → 1.2.4
* `feat: …` will bump the feature version, e.g. 1.2.3 → 1.3.0
Expand Down
2 changes: 1 addition & 1 deletion bin/hubot.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ if (options.create) {
console.error(` mkdir -p ${options.path}`)
console.error(` cd ${options.path}`)
console.error(' yo hubot')
console.error('See https://github.com/github/hubot/blob/master/docs/index.md for more details on getting started.')
console.error('See https://github.com/github/hubot/blob/main/docs/index.md for more details on getting started.')
process.exit(1)
}
if (options.file) {
Expand Down
2 changes: 1 addition & 1 deletion docs/deploying/azure.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Inside your new hubot directory, make sure you've created a git repository, and
Then [create a GitHub repository](https://help.github.com/articles/create-a-repo/) for your hubot. This is where Azure will pull your code from instead of needing to deploy directly from your dev machine to Azure.

% git remote add origin _your GitHub repo_
% git push -u origin master
% git push -u origin main

Once you have your GitHub repo, create an Azure website linked to your repo. In Azure, create a website and select integrated source control. When it asks "where is your source control" select GitHub and link this website to your git repo that you created in the previous step. If you have downloaded the Azure PowerShell modules, you can also do this via PowerShell.

Expand Down
4 changes: 2 additions & 2 deletions docs/deploying/heroku.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ scripts, you'd need to set the following environment variables:
At this point, you are ready to deploy and start chatting. With Heroku, that's a
git push away:

% git push heroku master
% git push heroku main

You'll see some text flying, and eventually some success. You should be able to
see your bot in your configured chat rooms at this point. If not, you can peek
Expand All @@ -55,7 +55,7 @@ If you make any changes to your hubot, just commit and push them as
before:

% git commit -am "Awesome scripts OMG"
% git push heroku master
% git push heroku main

Some scripts needs Redis to work, Heroku offers an addon called [Redis Cloud](https://addons.heroku.com/rediscloud), which has a free plan. To use it:

Expand Down
2 changes: 1 addition & 1 deletion docs/deploying/unix.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ really, you probably want some process monitoring using tools like

For starting at boot, you can create an init script appropriate for your UNIX
distribution. If you are using one of the process monitoring tools above, make
sure it boots at startup. See the [examples](https://github.com/github/hubot/tree/master/examples)
sure it boots at startup. See the [examples](https://github.com/github/hubot/tree/main/examples)
for configuration examples.

## Recommendations
Expand Down
2 changes: 1 addition & 1 deletion docs/deploying/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ You can set this .ps1 as scheduled task on boot if you like or some other way to

## Expanding the documentation

Not yet fleshed out. [Help contribute by submitting a pull request, please?](https://github.com/github/hubot/pull/new/master)
Not yet fleshed out. [Help contribute by submitting a pull request, please?](https://github.com/github/hubot/pull/new/main)
2 changes: 1 addition & 1 deletion docs/scripting.md
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ Listener middleware inserts logic between the listener matching a message and th
## Listener Middleware Examples
A fully functioning example can be found in [hubot-rate-limit](https://github.com/michaelansel/hubot-rate-limit/blob/master/src/rate-limit.coffee).
A fully functioning example can be found in [hubot-rate-limit](https://github.com/michaelansel/hubot-rate-limit/blob/main/src/rate-limit.coffee).
A simple example of middleware logging command executions:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
},
"release": {
"branches": [
"master"
"main"
],
"dryRun": false
}
Expand Down
8 changes: 4 additions & 4 deletions script/release
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ cd $(dirname "$0")/..

npm update && script/smoke-test

# Make sure we're on the master branch.
# Make sure we're on the main branch.

(git branch | grep -q '* master') || {
echo "Only release from the master branch."
(git branch | grep -q '* main') || {
echo "Only release from the main branch."
exit 1
}

Expand All @@ -41,4 +41,4 @@ git fetch -t origin
# Tag it and bag it.

npm publish && git tag "$tag" &&
git push origin master --tags
git push origin main --tags

0 comments on commit 62474fc

Please sign in to comment.