From 8b896ab4de45d15143813e38983e90bd380f69ac Mon Sep 17 00:00:00 2001 From: "Tony Arcieri (iqlusion)" Date: Sat, 30 Jan 2021 07:11:18 -0800 Subject: [PATCH] Rename default git branch from `develop` to `main` (#217) --- .github/workflows/ci.yml | 2 +- .github/workflows/security_audit.yml | 2 +- README.md | 8 ++++---- cli/README.md | 6 +++--- src/lib.rs | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 897c70d..74f7a96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: pull_request: {} push: - branches: develop + branches: main env: CARGO_INCREMENTAL: 0 diff --git a/.github/workflows/security_audit.yml b/.github/workflows/security_audit.yml index faaf741..a40357f 100644 --- a/.github/workflows/security_audit.yml +++ b/.github/workflows/security_audit.yml @@ -3,7 +3,7 @@ on: pull_request: paths: Cargo.lock push: - branches: develop + branches: main paths: Cargo.lock schedule: - cron: '0 0 * * *' diff --git a/README.md b/README.md index 363eb2e..4013ad9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + # yubikey-piv.rs @@ -193,12 +193,12 @@ or conditions. [docs-image]: https://docs.rs/yubikey-piv/badge.svg [docs-link]: https://docs.rs/yubikey-piv/ [license-image]: https://img.shields.io/badge/license-BSD-blue.svg -[license-link]: https://github.com/iqlusioninc/yubikey-piv.rs/blob/develop/COPYING +[license-link]: https://github.com/iqlusioninc/yubikey-piv.rs/blob/main/COPYING [rustc-image]: https://img.shields.io/badge/rustc-1.46+-blue.svg [maintenance-image]: https://img.shields.io/badge/maintenance-experimental-blue.svg [safety-image]: https://img.shields.io/badge/unsafe-forbidden-success.svg [safety-link]: https://github.com/rust-secure-code/safety-dance/ -[build-image]: https://github.com/iqlusioninc/yubikey-piv.rs/workflows/CI/badge.svg?branch=develop&event=push +[build-image]: https://github.com/iqlusioninc/yubikey-piv.rs/workflows/CI/badge.svg?branch=main&event=push [build-link]: https://github.com/iqlusioninc/yubikey-piv.rs/actions [gitter-image]: https://badges.gitter.im/badge.svg [gitter-link]: https://gitter.im/iqlusioninc/community @@ -214,7 +214,7 @@ or conditions. [yubico-piv-tool]: https://github.com/Yubico/yubico-piv-tool/ [Corrode]: https://github.com/jameysharp/corrode [cc-web]: https://contributor-covenant.org/ -[cc-md]: https://github.com/iqlusioninc/yubikey-piv.rs/blob/develop/CODE_OF_CONDUCT.md +[cc-md]: https://github.com/iqlusioninc/yubikey-piv.rs/blob/main/CODE_OF_CONDUCT.md [BSDL]: https://opensource.org/licenses/BSD-2-Clause [//]: # (github issues) diff --git a/cli/README.md b/cli/README.md index 887d1ad..81d2a72 100644 --- a/cli/README.md +++ b/cli/README.md @@ -1,4 +1,4 @@ - + # yubikey-cli.rs @@ -92,7 +92,7 @@ or conditions. [maintenance-image]: https://img.shields.io/badge/maintenance-experimental-blue.svg [safety-image]: https://img.shields.io/badge/unsafe-forbidden-success.svg [safety-link]: https://github.com/rust-secure-code/safety-dance/ -[build-image]: https://github.com/iqlusioninc/yubikey-piv.rs/workflows/Rust/badge.svg?branch=develop&event=push +[build-image]: https://github.com/iqlusioninc/yubikey-piv.rs/workflows/CI/badge.svg?branch=main&event=push [build-link]: https://github.com/iqlusioninc/yubikey-piv.rs/actions [gitter-image]: https://badges.gitter.im/badge.svg [gitter-link]: https://gitter.im/iqlusioninc/community @@ -108,5 +108,5 @@ or conditions. [yubico-piv-tool]: https://github.com/Yubico/yubico-piv-tool/ [Corrode]: https://github.com/jameysharp/corrode [cc-web]: https://contributor-covenant.org/ -[cc-md]: https://github.com/iqlusioninc/yubikey-cli.rs/blob/develop/CODE_OF_CONDUCT.md +[cc-md]: https://github.com/iqlusioninc/yubikey-cli.rs/blob/main/CODE_OF_CONDUCT.md [BSDL]: https://opensource.org/licenses/BSD-2-Clause diff --git a/src/lib.rs b/src/lib.rs index 708ddac..e3660be 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -83,12 +83,12 @@ //! [YubiKey NEO]: https://support.yubico.com/support/solutions/articles/15000006494-yubikey-neo //! [YubiKey 4]: https://support.yubico.com/support/solutions/articles/15000006486-yubikey-4 //! [YubiKey 5]: https://www.yubico.com/products/yubikey-5-overview/ -//! [status]: https://github.com/tarcieri/yubikey-piv.rs#status +//! [status]: https://github.com/iqlusioninc/yubikey-piv.rs#status //! [yubico-piv-tool]: https://github.com/Yubico/yubico-piv-tool/ //! [Corrode]: https://github.com/jameysharp/corrode //! [piv-tool-guide]: https://www.yubico.com/wp-content/uploads/2016/05/Yubico_PIV_Tool_Command_Line_Guide_en.pdf //! [cc-web]: https://contributor-covenant.org/ -//! [cc-md]: https://github.com/tarcieri/yubikey-piv.rs/blob/develop/CODE_OF_CONDUCT.md +//! [cc-md]: https://github.com/iqlusioninc/yubikey-piv.rs/blob/main/CODE_OF_CONDUCT.md //! [BSDL]: https://opensource.org/licenses/BSD-2-Clause // Adapted from yubico-piv-tool: @@ -122,7 +122,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #![doc( - html_logo_url = "https://raw.githubusercontent.com/iqlusioninc/yubikey-piv.rs/develop/img/logo.png", + html_logo_url = "https://raw.githubusercontent.com/iqlusioninc/yubikey-piv.rs/main/img/logo.png", html_root_url = "https://docs.rs/yubikey-piv/0.1.0" )] #![forbid(unsafe_code)]