From 0a14589d46db902694b80659e5b2dbdd662feb1a Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Sun, 19 Feb 2023 16:12:12 -0500
Subject: [PATCH] ci: Update packages

---
 .github/workflows/build.yml | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 72ff4b8..066ef98 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,27 +10,21 @@ on:
 env:
   CARGO_BIN_NAME: retrotool retrotool-gui
   CARGO_TARGET_DIR: target
+  UBUNTU_PACKAGES: libx11-dev libasound2-dev libudev-dev
 
 jobs:
   check:
     name: Check
+    runs-on: ubuntu-latest
     env:
       RUSTFLAGS: -D warnings
-    strategy:
-      matrix:
-        include:
-          - platform: ubuntu-latest
-            packages: libasound2-dev
-      fail-fast: false
-    runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install dependencies
-        if: matrix.packages != ''
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install ${{ matrix.packages }}
+          sudo apt-get -y install $UBUNTU_PACKAGES
       - name: Setup Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
@@ -61,21 +55,16 @@ jobs:
     name: Test
     strategy:
       matrix:
-        include:
-          - platform: ubuntu-latest
-            packages: libasound2-dev
-          - platform: windows-latest
-          - platform: macos-latest
+        platform: [ubuntu-latest, windows-latest, macos-latest]
       fail-fast: false
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install dependencies
-        if: matrix.packages != ''
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install ${{ matrix.packages }}
+          sudo apt-get -y install $UBUNTU_PACKAGES
       - name: Setup Rust toolchain
         uses: dtolnay/rust-toolchain@stable
       - name: Cargo test
@@ -125,11 +114,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Install dependencies
-        if: matrix.packages != ''
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install ${{ matrix.packages }}
       - name: Install cargo-zigbuild
         if: matrix.build == 'zigbuild'
         run: pip install cargo-zigbuild
@@ -161,7 +145,6 @@ jobs:
             target: x86_64-unknown-linux-gnu
             name: linux-x86_64
             build: build
-            packages: libasound2-dev
           - platform: windows-latest
             target: x86_64-pc-windows-msvc
             name: windows-x86_64
@@ -184,10 +167,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install dependencies
-        if: matrix.packages != ''
+        if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install ${{ matrix.packages }}
+          sudo apt-get -y install $UBUNTU_PACKAGES
       - name: Install cargo-zigbuild
         if: matrix.build == 'zigbuild'
         run: pip install cargo-zigbuild