Skip to content

Commit

Permalink
Convert internal links from master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
orta committed Feb 4, 2021
1 parent 2da8007 commit e1f7952
Show file tree
Hide file tree
Showing 14 changed files with 62 additions and 55 deletions.
Binary file removed .DS_Store
Binary file not shown.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ matrix:
- echo "Validating that danger pr works as expected"
- DEBUG="*" danger pr https://github.com/danger/danger-js/pull/465 --dangerfile dangerfile.circle.js --verbose

- echo "Grabbing master so that danger-local can use it for comparison"
- git checkout -t origin/master || true
- echo "Grabbing main so that danger-local can use it for comparison"
- git checkout -t origin/main || true
- '[ ! -z $TRAVIS_PULL_REQUEST ] && DEBUG="*" danger local --dangerfile
source/platforms/git/_tests/local_dangerfile_example.ts || echo "Skipping Danger Local for non PR run"'

Expand Down
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
// Please add your own contribution below inside the Master section, no need to
// Please add your own contribution below inside the Main section, no need to
// set a version number, that happens during a deploy. Thanks!
//
// These docs are aimed at users rather than danger developers, so please limit technical
Expand All @@ -11,7 +11,7 @@
-->

## Master
## Main

<!-- Your comment below this -->

Expand Down Expand Up @@ -588,7 +588,7 @@ Also, `danger pr` now accepts a `--process` arg.
body: "Here is your new repo template files",
owner: "orta",
repo: "new-repo",
baseBranch: "master",
baseBranch: "main",
newBranchName: "welcome",
commitMessage: "Sets up the welcome package",
},
Expand Down
33 changes: 20 additions & 13 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ yarn test
yarn lint
```

The fixers for both tslint and prettier will be applied when you commit, and on a push your code will be verified
that it compiles.
The fixers for both tslint and prettier will be applied when you commit, and on a push your code will be verified that
it compiles.

### How does Danger JS work?

Check the [architecture doc](https://github.com/danger/danger-js/blob/master/docs/architecture.md).
Check the [architecture doc](https://github.com/danger/danger-js/blob/main/docs/architecture.md).

### What is the TODO?

Expand All @@ -34,21 +34,28 @@ Check the issues, I try and keep my short term perspective there. Long term is i

Following [this commit](https://github.com/danger/danger-js/commit/a26ac3b3bd4f002acd37f6a363c8e74c9d5039ab) as a model:

* Checkout the `master` branch. Ensure your working tree is clean, and make sure you have the latest changes by running `git pull`.
* Update `package.json` with the new version - for the sake of this example, the new version is **0.21.0**.
* Modify `changelog.md`, adding a new `### 0.21.0` heading under the `### Master` heading at the top of the file.
* Commit both changes with the commit message **Version bump**.
* Tag this commit - `git tag 0.21.0`.
* Push the commit and tag to master - `git push origin master --follow-tags`. Travis CI will build the tagged commit and publish that tagged version to NPM.
- Checkout the `main` branch. Ensure your working tree is clean, and make sure you have the latest changes by running
`git pull`.
- Update `package.json` with the new version - for the sake of this example, the new version is **0.21.0**.
- Modify `changelog.md`, adding a new `### 0.21.0` heading under the `### Main` heading at the top of the file.
- Commit both changes with the commit message **Version bump**.
- Tag this commit - `git tag 0.21.0`.
- Push the commit and tag to master - `git push origin main --follow-tags`. Travis CI will build the tagged commit and
publish that tagged version to NPM.

:ship:

## License, Contributor's Guidelines and Code of Conduct

We try to keep as much discussion as possible in GitHub issues, but also have a pretty inactive Slack --- if you'd like an invite, ping [@Orta](https://twitter.com/orta/) a DM on Twitter with your email. It's mostly interesting if you want to stay on top of Danger without all the emails from GitHub.
We try to keep as much discussion as possible in GitHub issues, but also have a pretty inactive Slack --- if you'd like
an invite, ping [@Orta](https://twitter.com/orta/) a DM on Twitter with your email. It's mostly interesting if you want
to stay on top of Danger without all the emails from GitHub.

> This project is open source under the MIT license, which means you have full access to the source code and can modify it to fit your own needs.
> This project is open source under the MIT license, which means you have full access to the source code and can modify
> it to fit your own needs.
>
> This project subscribes to the [Moya Contributors Guidelines](https://github.com/Moya/contributors) which TLDR: means we give out push access easily and often.
> This project subscribes to the [Moya Contributors Guidelines](https://github.com/Moya/contributors) which TLDR: means
> we give out push access easily and often.
>
> Contributors subscribe to the [Contributor Code of Conduct](http://contributor-covenant.org/version/1/3/0/) based on the [Contributor Covenant](http://contributor-covenant.org) version 1.3.0.
> Contributors subscribe to the [Contributor Code of Conduct](http://contributor-covenant.org/version/1/3/0/) based on
> the [Contributor Covenant](http://contributor-covenant.org) version 1.3.0.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Nevercode, buddybuild, Buddy.works, TeamCity, Visual Studio Team Services, Screw
Codefresh, AppCenter, BitBucket Pipelines, or Cirrus CI.

[![npm](https://img.shields.io/npm/v/danger.svg)](https://www.npmjs.com/package/danger)
[![Build Status](https://travis-ci.org/danger/danger-js.svg?branch=master)](https://travis-ci.org/danger/danger-js)
[![Build Status](https://ci.appveyor.com/api/projects/status/ep5hgeox3lbc5c7f?svg=true)](https://ci.appveyor.com/project/orta/danger-js/branch/master)
[![Build Status](https://travis-ci.org/danger/danger-js.svg?branch=main)](https://travis-ci.org/danger/danger-js)
[![Build Status](https://ci.appveyor.com/api/projects/status/ep5hgeox3lbc5c7f?svg=true)](https://ci.appveyor.com/project/orta/danger-js/branch/main)
[![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/danger)

## For example?
Expand Down Expand Up @@ -89,7 +89,7 @@ yarn build; node --inspect distribution/commands/danger-pr.js https://github.com

### How does Danger JS work?

Check the [architecture doc](https://github.com/danger/danger-js/blob/master/docs/architecture.md).
Check the [architecture doc](https://github.com/danger/danger-js/blob/main/docs/architecture.md).

### What is the TODO?

Expand All @@ -99,7 +99,7 @@ Check the issues, I try and keep my short term perspective there. Long term is i

Following [this commit](https://github.com/danger/danger-js/commit/a26ac3b3bd4f002acd37f6a363c8e74c9d5039ab) as a model:

- Checkout the `master` branch. Ensure your working tree is clean, and make sure you have the latest changes by running
- Checkout the `main` branch. Ensure your working tree is clean, and make sure you have the latest changes by running
`git pull`.
- Publish - `npm run release -- [major/minor/patch] --ci`.

Expand All @@ -120,11 +120,11 @@ to stay on top of Danger without all the emails from GitHub.
> Contributors subscribe to the [Contributor Code of Conduct](http://contributor-covenant.org/version/1/3/0/) based on
> the [Contributor Covenant](http://contributor-covenant.org) version 1.3.0.
[emiss]: https://github.com/artsy/emission/blob/master/dangerfile.ts
[danger-js]: https://github.com/danger/danger-js/blob/master/dangerfile.ts
[meta]: https://github.com/artsy/metaphysics/blob/master/dangerfile.js
[fbj]: https://github.com/facebook/jest/blob/master/dangerfile.js
[sc]: https://github.com/styled-components/styled-components/blob/master/dangerfile.js
[rxjs]: https://github.com/ReactiveX/rxjs/blob/master/dangerfile.js
[emiss]: https://github.com/artsy/emission/blob/main/dangerfile.ts
[danger-js]: https://github.com/danger/danger-js/blob/main/dangerfile.ts
[meta]: https://github.com/artsy/metaphysics/blob/main/dangerfile.js
[fbj]: https://github.com/facebook/jest/blob/main/dangerfile.js
[sc]: https://github.com/styled-components/styled-components/blob/main/dangerfile.js
[rxjs]: https://github.com/ReactiveX/rxjs/blob/main/dangerfile.js
[setup]: http://danger.systems/guides/getting_started.html#creating-a-bot-account-for-danger-to-use
[jest]: https://github.com/facebook/jest
8 changes: 4 additions & 4 deletions VISION.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ great place to be a developer tool.
# Why Danger JS? What about Danger Ruby?

When I started Danger JS, Danger Ruby was two years old, is still doing just fine. See the
[original vision file](https://github.com/danger/danger/blob/master/VISION.md). This document assumes you have read it.
[original vision file](https://github.com/danger/danger/blob/main/VISION.md). This document assumes you have read it.

The amount of issues we get in comparison to the number of downloads on Rubygems makes me feel pretty confident about
Danger Ruby's state of production quality and maturity. I wanted to start thinking about the larger patterns in
software because at Artsy, we are starting to use JavaScript in
Danger Ruby's state of production quality and maturity. I wanted to start thinking about the larger patterns in software
because at Artsy, we are starting to use JavaScript in
[for many teams](http://artsy.github.io/blog/2016/08/15/React-Native-at-Artsy/).

I've explored [running JavaScript](https://github.com/danger/danger/pull/423) from the ruby Danger,
Expand All @@ -48,7 +48,7 @@ This realization came at the same time as serious thinking on a hosted version o
can limit the exposed Danger DSL to only something that can be obtained over the API remotely. By doing this, a hosted
Danger does not need to clone and run the associated projects. This is essential for my sanity. I cannot run multiple
[servers like CocoaDocs](http://cocoadocs.org). So far, I'm calling this Peril. You can consult the
[vision file for Peril](https://github.com/danger/peril/blob/master/VISION.md) if you'd like.
[vision file for Peril](https://github.com/danger/peril/blob/main/VISION.md) if you'd like.

[plugins]: https://www.npmjs.com/search?q=keywords:danger-plugin&page=1&ranking=optimal
[peril]: http://artsy.github.io/blog/2017/09/04/Introducing-Peril/
2 changes: 1 addition & 1 deletion dangerfile.lite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isTrivial = danger.github && (danger.github.pr.body + danger.github.pr.tit

if (!hasChangelog && !isTrivial) {
warn(
"Please add a changelog entry for your changes. You can find it in `CHANGELOG.md` \n\nPlease add your change and name to the master section."
"Please add a changelog entry for your changes. You can find it in `CHANGELOG.md` \n\nPlease add your change and name to the main section."
)
}

Expand Down
10 changes: 5 additions & 5 deletions docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ evaluating your code, and adds the DSL attributes into the global evaluation con
**Step 6: Results**. Once the `danger runner` process is finished with evaluation, the results are passed back to the
the platform. The platform then chooses whether to create/delete/edit any messages in core review.

[provs]: https://github.com/danger/danger-js/tree/master/source/ci_source/providers
[dangerdsl]: https://github.com/danger/danger-js/blob/master/source/dsl/DangerDSL.ts
[runner]: https://github.com/danger/danger-js/blob/master/source/commands/danger-runner.ts
[in_runner]: https://github.com/danger/danger-js/blob/master/source/runner/runners/inline.ts
[platforms]: https://github.com/danger/danger-js/blob/master/source/platforms
[provs]: https://github.com/danger/danger-js/tree/main/source/ci_source/providers
[dangerdsl]: https://github.com/danger/danger-js/blob/main/source/dsl/DangerDSL.ts
[runner]: https://github.com/danger/danger-js/blob/main/source/commands/danger-runner.ts
[in_runner]: https://github.com/danger/danger-js/blob/main/source/runner/runners/inline.ts
[platforms]: https://github.com/danger/danger-js/blob/main/source/platforms
2 changes: 1 addition & 1 deletion docs/guides/faq.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ can DM [orta][].

[77]: https://github.com/danger/danger-js/issues/77
[529]: https://github.com/danger/danger-js/issues/529
[vision.md]: https://github.com/danger/danger-js/blob/master/VISION.md
[vision.md]: https://github.com/danger/danger-js/blob/main/VISION.md
[open]: https://github.com/danger/danger-js/issues?q=is%3Aissue+is%3Aopen+label%3A%22Open+for+Discussion%22
[you-can-do-this]: https://github.com/danger/danger-js/issues?q=is%3Aissue+is%3Aopen+label%3A%22You+Can+Do+This%22
[orta]: https://twitter.com/orta/
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/peril.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ A lot of the information on Peril can be found on the
[Artsy blog: here](http://artsy.github.io/blog/2017/09/04/Introducing-Peril/)

Today Peril is self-hosted via heroku. There is a walkthrough on the
[Peril repo: here](https://github.com/danger/peril/blob/master/docs/setup_for_org.md). It's still a pretty fast moving
[Peril repo: here](https://github.com/danger/peril/blob/main/docs/setup_for_org.md). It's still a pretty fast moving
project ever 6 months into deployment so expect to maybe fix your own problem occasionally.

## Dangerfile implications
Expand Down
16 changes: 8 additions & 8 deletions docs/guides/the_dangerfile.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ Some TypeScript examples:
- **Apps** - [Artsy/Emission][emiss]
- **Libraries** [danger/danger-js][danger-js], [apollographql/apollo-client][apollo]

[emiss]: https://github.com/artsy/emission/blob/master/dangerfile.ts
[danger-js]: https://github.com/danger/danger-js/blob/master/dangerfile.ts
[meta]: https://github.com/artsy/metaphysics/blob/master/dangerfile.js
[rn]: https://github.com/facebook/react-native/blob/master/bots/dangerfile.js
[r]: https://github.com/facebook/react/blob/master/dangerfile.js
[rxjs]: https://github.com/ReactiveX/rxjs/blob/master/dangerfile.js
[emiss]: https://github.com/artsy/emission/blob/main/dangerfile.ts
[danger-js]: https://github.com/danger/danger-js/blob/main/dangerfile.ts
[meta]: https://github.com/artsy/metaphysics/blob/main/dangerfile.js
[rn]: https://github.com/facebook/react-native/blob/main/bots/dangerfile.js
[r]: https://github.com/facebook/react/blob/main/dangerfile.js
[rxjs]: https://github.com/ReactiveX/rxjs/blob/main/dangerfile.js
[setup]: http://danger.systems/guides/getting_started.html#creating-a-bot-account-for-danger-to-use
[jest]: https://github.com/facebook/jest
[transpilation_guide]: /js/tutorials/transpilation.html
[changelog]: http://danger.systems/js/changelog.html
[apollo]: https://github.com/apollographql/apollo-client/blob/master/config/dangerfile.ts
[bamlab]: https://github.com/bamlab/dev-standards/blob/master/dangerfile.js
[apollo]: https://github.com/apollographql/apollo-client/blob/main/config/dangerfile.ts
[bamlab]: https://github.com/bamlab/dev-standards/blob/main/dangerfile.js
2 changes: 1 addition & 1 deletion docs/tutorials/transpilation.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ it("does nothing when there's a PR body", () => {
})
```

[tsconfig]: https://github.com/artsy/emission/blob/master/tsconfig.json
[tsconfig]: https://github.com/artsy/emission/blob/main/tsconfig.json

### Disabling Transpilation

Expand Down
10 changes: 5 additions & 5 deletions docs/usage/danger-process.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Finally, let me ([@orta][]) know! I want to keep track of them all on the Danger
Danger JS will re-send the JSON to your process.

[danger-swift]: https://github.com/danger/danger-swift
[swift-json]: https://github.com/danger/danger-swift/blob/master/fixtures/eidolon_609.json
[swift-json]: https://github.com/danger/danger-swift/blob/main/fixtures/eidolon_609.json
[swift-stdin]:
https://github.com/danger/danger-swift/blob/1576e336e41698861456533463c8821675427258/Sources/Runner/main.swift#L9-L11
[swift-eval]:
Expand All @@ -209,10 +209,10 @@ Finally, let me ([@orta][]) know! I want to keep track of them all on the Danger
[swift-stdout]:
https://github.com/danger/danger-swift/blob/1576e336e41698861456533463c8821675427258/Sources/Runner/main.swift#L48-L50
[swift-first-pr]: https://github.com/danger/danger-swift/pull/12
[dangerjsondsltype]: https://github.com/danger/danger-js/blob/master/source/dsl/DangerDSL.ts
[dangerjsondsltype]: https://github.com/danger/danger-js/blob/main/source/dsl/DangerDSL.ts
[into nvm]: https://github.com/creationix/nvm
[@orta]: https://github.com/orta
[dangerresults]: https://github.com/danger/danger-js/blob/master/source/dsl/DangerResults.ts
[incoming]: https://github.com/danger/danger-js/blob/master/source/danger-incoming-process-schema.json
[outgoing]: https://github.com/danger/danger-js/blob/master/source/danger-outgoing-process-schema.json
[dangerresults]: https://github.com/danger/danger-js/blob/main/source/dsl/DangerResults.ts
[incoming]: https://github.com/danger/danger-js/blob/main/source/danger-incoming-process-schema.json
[outgoing]: https://github.com/danger/danger-js/blob/main/source/danger-outgoing-process-schema.json
[danger-rust]: https://github.com/danger/rust
2 changes: 1 addition & 1 deletion source/commands/danger-init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const showNonGitHubWarning = (ui: InitUI) => {
ui.say("\nWe're definitely open to PRs improving this. You can find the code at:")
const link = ui.link(
"danger/danger-js#/source/commands/danger-init.ts",
"https://github.com/danger/danger-js/blob/master/source/commands/danger-init.ts"
"https://github.com/danger/danger-js/blob/main/source/commands/danger-init.ts"
)
ui.say("\n > " + link + "\n")
}
Expand Down

0 comments on commit e1f7952

Please sign in to comment.