Skip to content

Commit

Permalink
docs: fix ci and a few references to master in readme (#460)
Browse files Browse the repository at this point in the history
  • Loading branch information
rogerlz authored Dec 5, 2024
1 parent f768ea6 commit d425fd7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
branches:
- master
- main
paths:
- docs/**
- .github/workflows/cd-docs.yaml
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center"><a href="https://docs.kalico.gg"><img align="center" src="docs/logo/kalico-big.png" alt="Kalico Logo"></a></p>

[![Action Status](https://github.com/kalico-crew/kalico/actions/workflows/ci-build_test.yaml/badge.svg?branch=master)](https://github.com/kalico-crew/kalico/actions/workflows/ci-build_test.yaml)
[![Action Status](https://github.com/kalico-crew/kalico/actions/workflows/ci-build_test.yaml/badge.svg?branch=main)](https://github.com/kalico-crew/kalico/actions/workflows/ci-build_test.yaml)

# Welcome to the Kalico project!

Expand All @@ -12,7 +12,7 @@ If I want my printer to light itself on fire, I should be able to make my printe

See the [Danger Features document](https://docs.kalico.gg/Danger_Features.html) for more information on *some* of the differences from Klipper.

## Features merged into the master branch:
## Features merged into the main branch:

- [core: no Python2 tests; no PRU boards](https://github.com/kalico-crew/kalico/pull/39)

Expand Down Expand Up @@ -173,20 +173,20 @@ From the KIAUH menu select:
- [S] Settings
- 1\) Set custom Klipper repository
- Use `https://github.com/kalico-crew/kalico` as the new repository URL
- Use `master` or `bleeding-edge-v2` as the new branch name
- Use `main` or `bleeding-edge-v2` as the new branch name
- Select 'Y' to apply the changes
- Enter 'B' for back twice
- 'Q' to quit

### Option 3. Adding a git-remote to the existing installation
Can switch back to mainline klipper at any time via a `git checkout upstream_master`
Can switch back to mainline klipper at any time via a `git checkout upstream_main`

```bash
cd ~/klipper
git remote add danger https://github.com/kalico-crew/kalico.git
git checkout -b upstream-master origin/master
git remote add kalico https://github.com/kalico-crew/kalico.git
git checkout -b upstream-main origin/master
git branch -D master
git checkout -b master danger/master
git checkout -b main kalico/main
sudo systemctl restart klipper
sudo systemctl restart moonraker
```
Expand Down

0 comments on commit d425fd7

Please sign in to comment.