From 35d262d9466a57a7e1e7ec8b6dbd745066aede31 Mon Sep 17 00:00:00 2001
From: Kyle Simpson <kyleandrew.simpson@gmail.com>
Date: Fri, 13 Nov 2020 19:15:33 +0000
Subject: [PATCH] CI round 2

---
 .github/workflows/ci.yml   | 7 +++----
 .github/workflows/docs.yml | 2 +-
 README.md                  | 4 +++-
 src/lib.rs                 | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86b3a5056..87d2a783d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         toolchain: nightly
-        components: rustfmt clippy
+        components: rustfmt, clippy
         override: true
     - name: Rustfmt
       run: cargo +nightly fmt --all -- --check
@@ -50,7 +50,7 @@ jobs:
           - name: Windows
             os: windows-latest
           - name: driver only
-            features: driver
+            features: driver rustls
           - name: gateway only
             features: serenity-rustls
 
@@ -131,8 +131,7 @@ jobs:
         env:
           RUSTDOCFLAGS: -D broken_intra_doc_links
         run: |
-          cargo doc --no-deps --features collector,voice
-          cargo doc --no-deps -p command_attr
+          cargo doc --no-deps --all-features
 
   examples:
     name: Examples
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 4cd229bb0..547813c84 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -49,7 +49,7 @@ jobs:
           DIR=${GITHUB_REF/refs\/+(heads|tags)\//}
           mkdir -p ./docs/$DIR
           touch ./docs/.nojekyll
-          echo '<meta http-equiv="refresh" content="0;url=serenity/index.html">' > ./docs/$DIR/index.html
+          echo '<meta http-equiv="refresh" content="0;url=songbird/index.html">' > ./docs/$DIR/index.html
           mv ./target/doc/* ./docs/$DIR/
 
       - name: Deploy docs
diff --git a/README.md b/README.md
index 1b2805cab..14150d38b 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,9 @@ Songbird's logo is based upon the copyright-free image ["Black-Capped Chickadee"
 [lavalink]: https://github.com/Frederikam/Lavalink
 [this crate's examples directory]: https://github.com/serenity-rs/songbird/tree/current/examples
 
-[build badge]: https://img.shields.io/github/workflow/status/serenity-rs/songbird/Build%20and%20Test%20(Stable)?style=flat-square
+https://github.com/serenity-rs/songbird/actions/runs/362160207
+
+[build badge]: https://img.shields.io/github/workflow/status/serenity-rs/songbird/CI?style=flat-square
 [build]: https://github.com/serenity-rs/songbird/actions
 
 [docs-badge]: https://img.shields.io/badge/docs-online-4d76ae.svg?style=flat-square
diff --git a/src/lib.rs b/src/lib.rs
index b887a28ab..8ed0e06cc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,6 @@
 #![doc(
-    html_logo_url = "https://raw.githubusercontent.com/serenity-rs/songbird/master/songbird.png",
-    html_favicon_url = "https://raw.githubusercontent.com/serenity-rs/songbird/master/songbird-ico.png"
+    html_logo_url = "https://raw.githubusercontent.com/serenity-rs/songbird/current/songbird.png",
+    html_favicon_url = "https://raw.githubusercontent.com/serenity-rs/songbird/current/songbird-ico.png"
 )]
 #![deny(missing_docs)]
 //! ![project logo][logo]
@@ -28,7 +28,7 @@
 //!
 //! Songbird's logo is based upon the copyright-free image ["Black-Capped Chickadee"] by George Gorgas White.
 //!
-//! [logo]: https://github.com/serenity-rs/songbird/raw/master/songbird.png
+//! [logo]: https://raw.githubusercontent.com/serenity-rs/songbird/current/songbird.png
 //! [serenity]: https://github.com/serenity-rs/serenity
 //! [twilight]: https://github.com/twilight-rs/twilight
 //! [this crate's examples directory]: https://github.com/serenity-rs/songbird/tree/current/examples