From d425fd712f724d53c626171d24e7c91c76967983 Mon Sep 17 00:00:00 2001 From: Rogerio Goncalves Date: Thu, 5 Dec 2024 18:48:14 +0000 Subject: [PATCH] docs: fix ci and a few references to master in readme (#460) --- .github/workflows/cd-docs.yaml | 2 +- README.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cd-docs.yaml b/.github/workflows/cd-docs.yaml index e3d49d618..909cd67dd 100644 --- a/.github/workflows/cd-docs.yaml +++ b/.github/workflows/cd-docs.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: push: branches: - - master + - main paths: - docs/** - .github/workflows/cd-docs.yaml diff --git a/README.md b/README.md index 3c668b218..c75fff5cd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

Kalico Logo

-[![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! @@ -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) @@ -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 ```