From e722b4f92ee328009765d72fc084c04562983862 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Thu, 30 Dec 2021 22:39:27 +0100 Subject: [PATCH] Rename main branch (#239) --- .github/workflows/ci.yml | 2 +- .github/workflows/gh-pages.yml | 2 +- README.md | 4 ++-- src/main.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 160d9ae..390e565 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: schedule: - cron: '30 3 * * 2' diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 35f17b3..c32ec71 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -3,7 +3,7 @@ name: github pages on: push: branches: - - master + - main jobs: deploy: diff --git a/README.md b/README.md index 86c82a6..1746860 100644 --- a/README.md +++ b/README.md @@ -120,13 +120,13 @@ Thanks to @severen for coming up with the name "tealdeer"! [outfieldr-gh]: https://gitlab.com/ve-nt/outfieldr [python-gh]: https://github.com/tldr-pages/tldr-python-client -[benchmark-dockerfile]: https://github.com/dbrgn/tealdeer/blob/master/benchmarks/Dockerfile +[benchmark-dockerfile]: https://github.com/dbrgn/tealdeer/blob/main/benchmarks/Dockerfile [client-spec]: https://github.com/tldr-pages/tldr/blob/main/CLIENT-SPECIFICATION.md [hyperfine-gh]: https://github.com/sharkdp/hyperfine [outfieldr-comment-tls]: https://github.com/dbrgn/tealdeer/issues/129#issuecomment-833596765 -[github-actions]: https://github.com/dbrgn/tealdeer/actions?query=branch%3Amaster +[github-actions]: https://github.com/dbrgn/tealdeer/actions?query=branch%3Amain [github-actions-badge]: https://github.com/dbrgn/tealdeer/workflows/CI/badge.svg [crates-io]: https://crates.io/crates/tealdeer [crates-io-badge]: https://img.shields.io/crates/v/tealdeer.svg diff --git a/src/main.rs b/src/main.rs index 7b2e45c..e6d79df 100644 --- a/src/main.rs +++ b/src/main.rs @@ -340,7 +340,7 @@ fn init_log() {} fn get_languages(env_lang: Option<&str>, env_language: Option<&str>) -> Vec { // Language list according to - // https://github.com/tldr-pages/tldr/blob/master/CLIENT-SPECIFICATION.md#language + // https://github.com/tldr-pages/tldr/blob/main/CLIENT-SPECIFICATION.md#language if env_lang.is_none() { return vec!["en".to_string()];