From 004043e6acbaa30dc24d40acca5ff232c5ad46fe Mon Sep 17 00:00:00 2001
From: Adam Mika <amika@squareup.com>
Date: Fri, 1 Dec 2023 13:57:02 -0700
Subject: [PATCH] unify into one yaml file

---
 .github/workflows/ci.yml      | 19 +++++++++++++++----
 .github/workflows/rustfmt.yml | 21 ---------------------
 2 files changed, 15 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/rustfmt.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a14fb83a..d8edf1f7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,8 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build-and-test:
+  test:
+    name: cargo test
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
@@ -24,7 +25,17 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: ${{ matrix.rust }}
-      - name: Build
-        run: cargo build --verbose --workspace
       - name: Test
-        run: cargo test --verbose --workspace
+        run: cargo test --workspace
+  format:
+    name: cargo fmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rustfmt
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          components: rustfmt
+      - name: Rustfmt Check
+        uses: actions-rust-lang/rustfmt@v1
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
deleted file mode 100644
index 1b19b7cc..00000000
--- a/.github/workflows/rustfmt.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Rustfmt
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - '*'
-
-jobs:
-  format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rustfmt
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          components: rustfmt
-      - name: Rustfmt Check
-        uses: actions-rust-lang/rustfmt@v1