Commit e4187db

authored

Merge pull request #2570 from rust-lang/tshepang/branch-rename

rename primary git branch

2 parents 9565ecd + 0aea968 commit e4187dbCopy full SHA for e4187db

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ name: CI`
`3`	`3`	`on:`
`4`	`4`	`push:`
`5`	`5`	`branches:`
`6`		`- - master`
	`6`	`+ - main`
`7`	`7`	`pull_request:`
`8`	`8`	`schedule:`
`9`	`9`	`# Run multiple times a day as the successfull cached links are not checked every time.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ jobs:`
`14`	`14`	`github-app-id: ${{ vars.APP_CLIENT_ID }}`
`15`	`15`	`zulip-stream-id: 196385`
`16`	`16`	`zulip-bot-email: "rustc-dev-guide-gha-notif-bot@rust-lang.zulipchat.com"`
`17`		`- pr-base-branch: master`
	`17`	`+ pr-base-branch: main`
`18`	`18`	`branch-name: rustc-pull`
`19`	`19`	`secrets:`
`20`	`20`	`zulip-api-token: ${{ secrets.ZULIP_API_TOKEN }}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ command = "mdbook-mermaid"`
`11`	`11`
`12`	`12`	`[output.html]`
`13`	`13`	`git-repository-url = "https://github.com/rust-lang/rustc-dev-guide"`
`14`		`-edit-url-template = "https://github.com/rust-lang/rustc-dev-guide/edit/master/{path}"`
	`14`	`+edit-url-template = "https://github.com/rust-lang/rustc-dev-guide/edit/main/{path}"`
`15`	`15`	`additional-js = [`
`16`	`16`	`"mermaid.min.js",`
`17`	`17`	`"mermaid-init.js",`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ elif [ "$GITHUB_EVENT_NAME" = "pull_request" ] ; then # running in PR CI build`
`32`	`32`
`33`	`33`	`echo "Checking files changed since $BASE_SHA: $CHANGED_FILES"`
`34`	`34`	`else # running locally`
`35`		`- COMMIT_RANGE=master...`
	`35`	`+ COMMIT_RANGE=main...`
`36`	`36`	`CHANGED_FILES=$(git diff --name-only $COMMIT_RANGE \| sed 's#^src/##' \| tr '\n' ' ')`
`37`	`37`	`FLAGS="-f $CHANGED_FILES"`
`38`	`38`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -34,7 +34,7 @@ specifically [`rustc_driver_impl::run_compiler`][rdi_rc]
`34`	`34`	[`rustc_driver`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_driver/
`35`	`35`	[`rustc_interface`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_interface/index.html
`36`	`36`	[`Callbacks`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_driver/trait.Callbacks.html
`37`		`-[example]: https://github.com/rust-lang/rustc-dev-guide/blob/master/examples/rustc-interface-example.rs`
	`37`	`+[example]: https://github.com/rust-lang/rustc-dev-guide/blob/main/examples/rustc-interface-example.rs`
`38`	`38`	`[i_rc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_interface/interface/fn.run_compiler.html`
`39`	`39`	`[rd_rc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_driver/fn.run_compiler.html`
`40`	`40`	`[rdi_rc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_driver_impl/fn.run_compiler.html`

Comments

(0)