From e1e8a0b78d62697d2eb6c8b8959d0abcf13529fb Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Fri, 16 Aug 2024 16:53:11 +0200
Subject: [PATCH] fix: fixed windows build via msys2/setup-msys2@v2

---
 .github/workflows/build-and-deploy.yml | 19 +++++++------------
 .github/workflows/test-on-windows.yml  |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 2e56b45a..e066e150 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -61,25 +61,20 @@ jobs:
         choco install openssl.light -y
         choco install make -y
         choco install 7zip -y
-        choco install pkgconfiglite -y
-        mkdir C:\pkg-config
         choco install zadig -y
-        curl -L "https://github.com/libusb/libusb/releases/download/v1.0.24/libusb-1.0.24.7z" -o "C:\libusb.7z"
-        7z x -y "C:\libusb.7z" -o"C:\libusb"
         curl -L "https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip" -o "C:\wpcap-sdk.zip"
         7z x -y "C:\wpcap-sdk.zip" -o"C:\winpcap"
-        copy builder\libusb.pc C:\pkg-config\libusb.pc
-        copy builder\libusb.pc C:\pkg-config\libusb-1.0.pc
 
-    - name: Build on Windows
+    - name: Install libusb via mingw
       if: ${{ matrix.os == 'windows-latest' }}
-      run: |
-        env PKG_CONFIG_PATH=C:\pkg-config\ make -e TARGET="${{ env.OUTPUT }}"
+      uses: msys2/setup-msys2@v2
+      with:
+        install: |-
+          mingw64/mingw-w64-x86_64-libusb
+          mingw64/mingw-w64-x86_64-pkg-config
 
     - name: Build
-      if: ${{ matrix.os != 'windows-latest' }}
-      run: |
-        make -e TARGET="${{ env.OUTPUT }}"
+      run: make -e TARGET="${{ env.OUTPUT }}"
 
     - name: Verify Build
       run: |
diff --git a/.github/workflows/test-on-windows.yml b/.github/workflows/test-on-windows.yml
index 346f95a4..08ea79da 100644
--- a/.github/workflows/test-on-windows.yml
+++ b/.github/workflows/test-on-windows.yml
@@ -24,7 +24,7 @@ jobs:
           with:
             go-version: ${{ matrix.go-version }}
     
-        - name: Install libus via mingw
+        - name: Install libusb via mingw
           uses: msys2/setup-msys2@v2
           with:
             install: |-