Skip to content

Commit

Permalink
fix(Updater): Replace "master" branch tag with "main" to reflect NoCl…
Browse files Browse the repository at this point in the history
…oud's GitHub structure v2
  • Loading branch information
DGAlexandru committed Jan 25, 2025
1 parent 5a87c49 commit f337e8c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/_pages/development/building-and-modifying-NoCloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ You need to edit the newly created file in order to be able to talk with your ro
Setting embedded to `false` disables all functionality that assumes that NoCloud runs on the robot such as some file-system related things.

For a list of possible values for `implementation` consult the robot implementations in
[https://github.com/DGAlexandru/NoCloud/tree/master/backend/lib/robots](https://github.com/DGAlexandru/NoCloud/tree/master/backend/lib/robots).
[https://github.com/DGAlexandru/NoCloud/tree/main/backend/lib/robots](https://github.com/DGAlexandru/NoCloud/tree/main/backend/lib/robots).
NoCloud is also capable of running without a real robot. The `MockRobot` implementation provides a virtual robot
that has a few basic capabilities. It requires no further implementation specific configuration.

Expand Down
2 changes: 1 addition & 1 deletion docs/_pages/general/newcomer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,4 @@ In general and especially if you're new to open source, It's strongly recommende

Generally speaking, the best way to contribute to NoCloud is to support other NoCloud users.

For anything beyond that, make sure to familiarize yourself with the [CONTRIBUTING.md](https://github.com/DGAlexandru/NoCloud/blob/master/CONTRIBUTING.md)
For anything beyond that, make sure to familiarize yourself with the [CONTRIBUTING.md](https://github.com/DGAlexandru/NoCloud/blob/main/CONTRIBUTING.md)
2 changes: 1 addition & 1 deletion frontend/src/NoCloud/res/AboutText.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ We're all standing on the shoulders of giants. (<a href="https://xkcd.com/2347/"
### License
NoCloud is licensed under <a href="https://github.com/DGAlexandru/NoCloud/blob/master/LICENSE" rel="noopener" target="_blank">the Apache-2.0 license</a>,
NoCloud is licensed under <a href="https://github.com/DGAlexandru/NoCloud/blob/main/LICENSE" rel="noopener" target="_blank">the Apache-2.0 license</a>,
but I will spare you the boring wall of text that you won't read anyways, as honestly, the license doesn't really matter that much.
All relevant open-source licenses basically boil down to "no warranty/no liability" and "don't act in bad faith" with various ways of trying to enforce the latter.
Expand Down
4 changes: 2 additions & 2 deletions util/generate_build_metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ function GET_COMMIT_ID() {
const rootDirectory = path.resolve(__dirname, "..");
commitId = fs.readFileSync(rootDirectory + "/.git/HEAD", {"encoding": "utf-8"}).trim();

if (commitId.match(/^ref: refs\/heads\/master$/) !== null) {
commitId = fs.readFileSync(rootDirectory + "/.git/refs/heads/master", {"encoding": "utf-8"}).trim();
if (commitId.match(/^ref: refs\/heads\/main$/) !== null) {
commitId = fs.readFileSync(rootDirectory + "/.git/refs/heads/main", {"encoding": "utf-8"}).trim();
}
} catch (e) {
//intentional
Expand Down

0 comments on commit f337e8c

Please sign in to comment.