Merge pull request #2196 from kinnison/badges

Simplify workflow names and update README for badges

Author: kinnison

.github/workflows/centos-fmt-clippy-on-all.yaml

@@ -1,7 +1,7 @@
 # This is ci/actions-templates/centos-fmt-clippy.yaml
 # Do not edit this file in .github/workflows
 
-name: Centos checks, formatting, clippy, and shellcheck, of Rustup
+name: General Checks
 
 on:
   pull_request:

.github/workflows/linux-builds-on-master.yaml

@@ -1,7 +1,7 @@
 # This is ci/actions-templates/linux-builds-template.yaml
 # Do not edit this file in .github/workflows
 
-name: Linux-hosted builds of Rustup (master) # skip-pr skip-stable
+name: Linux (master) # skip-pr skip-stable
 
 on:
   push:         # skip-pr

.github/workflows/linux-builds-on-pr.yaml

@@ -1,7 +1,7 @@
 # This is ci/actions-templates/linux-builds-template.yaml
 # Do not edit this file in .github/workflows
 
-name: Linux-hosted builds of Rustup (PR) # skip-master skip-stable
+name: Linux (PR) # skip-master skip-stable
 
 on:
   pull_request: # skip-master skip-stable

.github/workflows/linux-builds-on-stable.yaml

@@ -1,7 +1,7 @@
 # This is ci/actions-templates/linux-builds-template.yaml
 # Do not edit this file in .github/workflows
 
-name: Linux-hosted builds of Rustup (stable) # skip-master skip-pr
+name: Linux (stable) # skip-master skip-pr
 
 on:
   push:         # skip-pr

.github/workflows/macos-builds-on-all.yaml

@@ -1,7 +1,7 @@
 # This is ci/actions-templates/macos-builds-template.yaml
 # Do not edit this file in .github/workflows
 
-name: Mac OS builds of Rustup
+name: Mac OS
 on:
   pull_request:
     branches:

.github/workflows/windows-builds-on-master.yaml

@@ -1,7 +1,7 @@
 # This is ci/actions-templates/windows-builds-template.yaml
 # Do not edit this file in .github/workflows
 
-name: Windows builds of Rustup (master) # skip-pr skip-stable
+name: Windows (master) # skip-pr skip-stable
 
 on:
   push:         # skip-pr

.github/workflows/windows-builds-on-pr.yaml

@@ -1,7 +1,7 @@
 # This is ci/actions-templates/windows-builds-template.yaml
 # Do not edit this file in .github/workflows
 
-name: Windows builds of Rustup (PR) # skip-master skip-stable
+name: Windows (PR) # skip-master skip-stable
 
 on:
   pull_request: # skip-master skip-stable

.github/workflows/windows-builds-on-stable.yaml

@@ -1,7 +1,7 @@
 # This is ci/actions-templates/windows-builds-template.yaml
 # Do not edit this file in .github/workflows
 
-name: Windows builds of Rustup (stable) # skip-master skip-pr
+name: Windows (stable) # skip-master skip-pr
 
 on:
   push:         # skip-pr

README.md

@@ -1,9 +1,10 @@
 # rustup: the Rust toolchain installer
 
-| CI           | Build Status                                             |
+| Master CI    | Build Status                                             |
 |--------------|----------------------------------------------------------|
-| Travis       | [![Travis Build Status][travis-badge]][travis-url]       |
-| AppVeyor     | [![AppVeyor Build Status][appveyor-badge]][appveyor-url] |
+| Windows      | ![Windows builds][actions-windows-master]                |
+| Mac OS       | ![Mac OS builds][actions-macos-master]                   |
+| Linux Etc    | ![Linux (etc) builds][actions-linux-master]              |
 
 *rustup* installs [The Rust Programming Language][rustlang] from the official
 release channels, enabling you to easily switch between stable, beta,
@@ -811,7 +812,6 @@ Licensed under either of
 at your option.
 
 <!-- Badges -->
-[travis-url]: https://travis-ci.com/rust-lang/rustup
-[travis-badge]: https://travis-ci.com/rust-lang/rustup.svg
-[appveyor-url]: https://ci.appveyor.com/project/rust-lang-libs/rustup
-[appveyor-badge]: https://ci.appveyor.com/api/projects/status/github/rust-lang/rustup?svg=true
+[actions-windows-master]: https://github.com/rust-lang/rustup/workflows/Windows%20(master)/badge.svg
+[actions-macos-master]: https://github.com/rust-lang/rustup/workflows/Mac%20OS/badge.svg?branch=master
+[actions-linux-master]: https://github.com/rust-lang/rustup/workflows/Linux%20(master)/badge.svg

ci/actions-templates/centos-fmt-clippy-template.yaml

@@ -1,7 +1,7 @@
 # This is ci/actions-templates/centos-fmt-clippy.yaml
 # Do not edit this file in .github/workflows
 
-name: Centos checks, formatting, clippy, and shellcheck, of Rustup
+name: General Checks
 
 on:
   pull_request: