Merge #185

185: Fix config file example format in README r=nickgerace a=nickgerace



Co-authored-by: Nick Gerace <nickagerace@gmail.com>

4 files changed, 24 insertions, 17 deletions

diff --git a/.github/workflows/push.yml b/.github/workflows/ci.yml
index 3c98fbd..1178da5 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/ci.yml
@@ -1,16 +1,22 @@
-name: push
+name: ci
 on:
   push:
-    branches-exclude:
-      - "main"
+    branches:
+      - staging
+      - trying
+  pull_request:
+    branches:
+      - main
     paths:
       - "**.rs"
       - "Cargo.*"
       - "rustfmt.toml"
-
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
-
-  prepare:
+  test:
+    name: "Lint and Test"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -20,6 +26,7 @@ jobs:
           toolchain: stable
           override: true
           components: rustfmt, clippy
+      - uses: Swatinem/rust-cache@v1
       - uses: actions-rs/cargo@v1
         with:
           command: fmt
@@ -31,8 +38,8 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
-
   build:
+    name: "Build"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -44,6 +51,7 @@ jobs:
           profile: minimal
           toolchain: stable
           override: true
+      - uses: Swatinem/rust-cache@v1
       - uses: actions-rs/cargo@v1
         with:
           command: build
diff --git a/.github/workflows/tag.yml b/.github/workflows/release.yml
index 6e840e7..3b59d20 100644
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/release.yml
@@ -1,11 +1,11 @@
-name: tag
+name: release
 on:
   push:
     tags:
       - "*"
 jobs:
-
-  publish:
+  release:
+    name: "Release"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
diff --git a/README.md b/README.md
index cb14a22..923fcf4 100644
--- a/README.md
+++ b/README.md
@@ -103,11 +103,9 @@ This config file will default to the classic display mode and set the default pa
 
 Here are the contents of the resulting config file:
 
-```json
-{
-  "path": "/home/neloth",
-  "display_mode": "Classic",
-}
+```toml
+path = '/home/neloth'
+display_mode = 'Classic'
 ```
 
 You can back up a config file and track its history with `git`.
diff --git a/bors.toml b/bors.toml
index 52d8906..87bc1c6 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,3 +1,4 @@
-# 15 minute timeout
 timeout_sec = 900
-status = ["prepare", "build"]
+status = ["Lint and Test", "Build %"]
+delete_merged_branches = true
+update_base_for_deletes	= true