Revert "test windows deps"

This reverts commit 09c73d4fab.

.github/workflows/rust.yml

@@ -10,149 +10,87 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build-linux:
+  fmt:
-
+    name: Formatting
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - name: install dependencies
+      - name: cargo fmt
-      run: |
+        run: cargo fmt --check
-        sudo apt-get update
-        sudo apt-get install libx11-dev libxtst-dev
-        sudo apt-get install libadwaita-1-dev libgtk-4-dev
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
-    - name: Check Formatting
-      run: cargo fmt --check
-    - name: Clippy
-      run: cargo clippy --all-features --all-targets -- --deny warnings
-    - name: Upload build artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: lan-mouse
-        path: target/debug/lan-mouse
-
-  build-windows:
-
-    runs-on: windows-latest
 
+  ci:
+    name: ${{ matrix.job }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+          - macos-15-intel
+        job:
+          - build
+          - check
+          - clippy
+          - test
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+      - uses: Swatinem/rust-cache@v2
-      with:
+      - name: Install Linux deps
-        python-version: '3.11'
+        if: runner.os == 'Linux'
-    # needed for cache restore
+        run: |
-    - name: create gtk dir
+          sudo apt-get update
-      run: mkdir C:\gtk-build\gtk\x64\release
+          sudo apt-get install libx11-dev libxtst-dev libadwaita-1-dev libgtk-4-dev
-    - uses: actions/cache@v3
+      - name: Install macOS dependencies
-      id: cache
+        if: runner.os == 'macOS'
-      with:
+        run: brew install gtk4 libadwaita imagemagick
-        path: c:/gtk-build/gtk/x64/release/**
+      - name: Install Windows Dependencies - create gtk dir
-        key: gtk-windows-build
+        if: runner.os == 'Windows'
-        restore-keys: gtk-windows-build
+        run: mkdir C:\gtk-build\gtk\x64\release
-    - name: Update path
+      - name: Install Windows Dependencies - install gtk from cache
-      run: |
+        uses: actions/cache@v3
-        echo "PKG_CONFIG=C:\gtk-build\gtk\x64\release\bin\pkgconf.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        if: runner.os == 'Windows'
-        echo "C:\pkg-config-lite-0.28-1\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        id: cache
-        echo "C:\gtk-build\gtk\x64\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        with:
-        echo $env:GITHUB_PATH
+          path: c:/gtk-build/gtk/x64/release/**
-        echo $env:PATH
+          key: gtk-windows-build
-    - name: Install dependencies
+          restore-keys: gtk-windows-build
-      if: steps.cache.outputs.cache-hit != 'true'
+      - name: Install Windows Dependencies - update PATH
-      run: |
+        if: runner.os == 'Windows'
-        # choco install msys2
+        run: |
-        # choco install visualstudio2022-workload-vctools
+          echo "PKG_CONFIG=C:\gtk-build\gtk\x64\release\bin\pkgconf.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        # choco install pkgconfiglite
+          echo "C:\pkg-config-lite-0.28-1\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        py -m venv .venv
+          echo "C:\gtk-build\gtk\x64\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        .venv\Scripts\activate.ps1
+          echo $env:GITHUB_PATH
-        py -m pip install gvsbuild
+          echo $env:PATH
-        # see https://github.com/wingtk/gvsbuild/pull/1004
+      - name: Install Windows dependencies - build gtk
-        Move-Item "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
+        if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true'
-        Move-Item "C:\Program Files\Git\bin" "C:\Program Files\Git\notbin"
+        run: |
-        gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
+          # choco install msys2
-        Move-Item "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
+          # choco install visualstudio2022-workload-vctools
-        Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
+          # choco install pkgconfiglite
-    - name: Build
+          py -m venv .venv
-      run: cargo build --verbose
+          .venv\Scripts\activate.ps1
-    - name: Run tests
+          py -m pip install gvsbuild
-      run: cargo test --verbose
+          gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
-    - name: Check Formatting
+      - name: cargo build
-      run: cargo fmt --check
+        if: matrix.job == 'build'
-    - name: Clippy
+        run: cargo check --workspace --all-targets --all-features
-      run: cargo clippy --all-features --all-targets -- --deny warnings
-    - name: Copy Gtk Dlls
-      run: Get-Childitem -Path "C:\\gtk-build\\gtk\\x64\\release\\bin\\*.dll" -File -Recurse | Copy-Item -Destination "target\\debug"
-    - name: Upload build artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: lan-mouse-windows
-        path: |
-          target/debug/lan-mouse.exe
-          target/debug/*.dll
 
-  build-macos:
+      - name: cargo check
-    runs-on: macos-15-intel
+        if: matrix.job == 'check'
-    steps:
+        run: cargo check --workspace --all-targets --all-features
-    - uses: actions/checkout@v4
-    - name: install dependencies
-      run: brew install gtk4 libadwaita imagemagick
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
-    - name: Check Formatting
-      run: cargo fmt --check
-    - name: Clippy
-      run: cargo clippy --all-features --all-targets -- --deny warnings
-    - name: Make icns
-      run: scripts/makeicns.sh
-    - name: Install cargo bundle
-      run: cargo install cargo-bundle
-    - name: Bundle
-      run: |
-        cargo bundle
-        scripts/copy-macos-dylib.sh
-    - name: Zip bundle
-      run: |
-        cd target/debug/bundle/osx
-        zip -r "Lan Mouse macOS (Intel).zip" "Lan Mouse.app"
-    - name: Upload build artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: Lan Mouse macOS (Intel)
-        path: target/debug/bundle/osx/Lan Mouse macOS (Intel).zip
 
-  build-macos-aarch64:
+      - name: cargo test
-    runs-on: macos-14
+        if: matrix.job == 'test'
-    steps:
+        run: cargo test --workspace --all-features
-    - uses: actions/checkout@v4
+
-    - name: install dependencies
+      - name: cargo clippy
-      run: brew install gtk4 libadwaita imagemagick
+        if: matrix.job == 'clippy'
-    - name: Build
+        run: cargo clippy --workspace --all-targets --all-features -- -D warnings
-      run: cargo build --verbose
+
-    - name: Run tests
+      - uses: clechasseur/rs-clippy-check@v4
-      run: cargo test --verbose
+        if: matrix.job == 'clippy'
-    - name: Check Formatting
+        with:
-      run: cargo fmt --check
+          args: --workspace --all-targets --all-features
-    - name: Clippy
-      run: cargo clippy --all-features --all-targets -- --deny warnings
-    - name: Make icns
-      run: scripts/makeicns.sh
-    - name: Install cargo bundle
-      run: cargo install cargo-bundle
-    - name: Bundle
-      run: |
-        cargo bundle
-        scripts/copy-macos-dylib.sh
-    - name: Zip bundle
-      run: |
-        cd target/debug/bundle/osx
-        zip -r "Lan Mouse macOS (ARM).zip" "Lan Mouse.app"
-    - name: Upload build artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: Lan Mouse macOS (ARM)
-        path: target/debug/bundle/osx/Lan Mouse macOS (ARM).zip