From 0c684261c960a3670afe86e15b7ac4aa1e93bc94 Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Mon, 8 Jan 2024 15:19:21 -0800
Subject: [PATCH] Tweak CI with new caching

---
 .github/workflows/main.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 47734a7ec..409422e87 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: sudo apt-get update
-      - run: sudo apt install libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev
+      - run: sudo apt install libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev libxdo-dev
       - uses: dtolnay/rust-toolchain@stable
       - uses: mozilla-actions/sccache-action@v0.0.3
       - uses: ilammy/setup-nasm@v1
@@ -72,10 +72,11 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: mozilla-actions/sccache-action@v0.0.3
       - uses: ilammy/setup-nasm@v1
-      - run: rustup component add rustfmt
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+      - uses: mozilla-actions/sccache-action@v0.0.3
       - uses: actions/checkout@v4
       - run: cargo fmt --all -- --check
 
@@ -86,10 +87,11 @@ jobs:
     steps:
       - run: sudo apt-get update
       - run: sudo apt install libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: mozilla-actions/sccache-action@v0.0.3
       - uses: ilammy/setup-nasm@v1
-      - run: rustup component add clippy
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+      - uses: mozilla-actions/sccache-action@v0.0.3
       - uses: actions/checkout@v4
       - run: cargo clippy --workspace --examples --tests -- -D warnings
 
@@ -136,7 +138,6 @@ jobs:
         working-directory: ./playwright-tests
     steps:
       # Do our best to cache the toolchain and node install steps
-      - uses: actions/checkout@v4
       - uses: ilammy/setup-nasm@v1
       - uses: actions/setup-node@v4
         with:
@@ -159,6 +160,7 @@ jobs:
       #   with:
       #     command: install
       #     args: --path packages/cli
+      - uses: actions/checkout@v4
       - name: Run Playwright tests
         run: npx playwright test
       - uses: actions/upload-artifact@v4
@@ -210,13 +212,13 @@ jobs:
             }
 
     steps:
-      - uses: actions/checkout@v4
       - uses: ilammy/setup-nasm@v1
       - name: install stable
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.platform.toolchain }}
           targets: ${{ matrix.platform.target }}
+          components: rustfmt
 
       - name: Install cross
         if: ${{ matrix.platform.cross == true }}
@@ -227,9 +229,6 @@ jobs:
           workspaces: core -> ../target
           save-if: ${{ matrix.features.key == 'all' }}
 
-      - name: Install rustfmt
-        run: rustup component add rustfmt
-
       - uses: actions/checkout@v4
 
       - name: test