Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Use main instead of master #140

Merged
merged 1 commit into from
Jan 28, 2021
Merged

Use main instead of master #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Global options:

## Linting

The primary function of configlet is to do _linting_: checking if a track's configuration files are properly structured - both syntactically and semantically. Misconfigured tracks may not sync correctly, may look wrong on the website, or may present a suboptimal user experience, so configlet's guards play an important part in maintaining the integrity of Exercism. The full list of rules that are checked by the linter can be found [here](https://github.com/exercism/v3-docs/blob/master/anatomy/tracks/configlet/linting.md).
The primary function of configlet is to do _linting_: checking if a track's configuration files are properly structured - both syntactically and semantically. Misconfigured tracks may not sync correctly, may look wrong on the website, or may present a suboptimal user experience, so configlet's guards play an important part in maintaining the integrity of Exercism. The full list of rules that are checked by the linter can be found [here](https://github.com/exercism/v3-docs/blob/main/anatomy/tracks/configlet/linting.md).

The `configlet lint` command is currently in the process of being implemented.

Expand Down
6 changes: 3 additions & 3 deletions src/sync/probspecs.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ proc getNameOfRemote(probSpecsDir, host, location: string): string =
proc validate(probSpecsRepo: ProbSpecsRepo) =
## Raises an error if the given `probSpecsRepo` is not a valid
## `problem-specifications` repo that is up-to-date with upstream.
const mainBranchName = "master"
const mainBranchName = "main"

let probSpecsDir = probSpecsRepo.dir
logDetailed(&"Using user-provided problem-specifications dir: {probSpecsDir}")
Expand Down Expand Up @@ -166,8 +166,8 @@ proc validate(probSpecsRepo: ProbSpecsRepo) =
showError(&"failed to fetch `{mainBranchName}` in " &
&"problem-specifications directory: '{probSpecsDir}'")

# Allow HEAD to be on a non-`master` branch, as long as it's up-to-date
# with `upstream/master`.
# Allow HEAD to be on a non-`main` branch, as long as it's up-to-date
# with `upstream/main`.
let (revHead, _) = execCmdEx("git rev-parse HEAD")
let (revUpstream, _) = execCmdEx(&"git rev-parse {remoteName}/{mainBranchName}")
if revHead != revUpstream:
Expand Down