update action/checkout in workflows, update to macos-latest

jankae · Oct 17, 2024 · b98fc17 · b98fc17
1 parent 12884b5
commit b98fc17
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 15 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -12,7 +12,7 @@ jobs:
   PC_Application_Ubuntu:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
@@ -52,7 +52,7 @@ jobs:
   PC_Application_Windows:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
 
       - name: Install Qt
@@ -112,14 +112,14 @@ jobs:
           path: Software/LibreCAL-GUI/release
 
   PC_Application_OSX:
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
-          brew install qt@6 libusb pcre
-          
+          brew install qt@6 pcre
+
       - name: Set Environment
         run: |
           echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH
@@ -157,7 +157,7 @@ jobs:
   Embedded_Firmware:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install toolchain
         run: |

diff --git a/.github/workflows/Release_tag_stable.yml b/.github/workflows/Release_tag_stable.yml
@@ -12,7 +12,7 @@ jobs:
     outputs:
       upload_url: ${{ steps.bump_release.outputs.upload_url }} 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
@@ -68,7 +68,7 @@ jobs:
     needs: PC_Application_Ubuntu
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
 
       - name: Install Qt
@@ -134,14 +134,14 @@ jobs:
 
   PC_Application_OSX:
     needs: PC_Application_Ubuntu
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
-          brew install qt@6 libusb pcre
-          
+          brew install qt@6 pcre
+
       - name: Set Environment
         run: |
           echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH
@@ -179,7 +179,7 @@ jobs:
     needs: PC_Application_Ubuntu
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install toolchain
         run: |

diff --git a/Software/LibreCAL-GUI/LibreCAL-GUI.pro b/Software/LibreCAL-GUI/LibreCAL-GUI.pro
@@ -33,7 +33,13 @@ LIBS += -lusb-1.0
 unix:LIBS += -L/usr/lib/
 win32:LIBS += -L"$$_PRO_FILE_PWD_" # Github actions placed libusb here
 osx:INCPATH += /usr/local/include
-osx:LIBS += $(shell pkg-config --libs libusb-1.0)
+osx:LIBS += -L/usr/local/lib
+
+mac{
+	QT_CONFIG -= no-pkg-config
+	CONFIG += link_pkgconfig
+	PKGCONFIG += libusb-1.0
+}
 
 # libusb-1.0.23 shall be extracted in same directory as this file
 windows{

diff --git a/Software/LibreCAL-GUI/Util/usbinbuffer.h b/Software/LibreCAL-GUI/Util/usbinbuffer.h
@@ -1,7 +1,13 @@
 #ifndef USBINBUFFER_H
 #define USBINBUFFER_H
 
+#include <QtGlobal>
+#ifdef Q_OS_MACOS
+#include <libusb.h>
+#else
 #include <libusb-1.0/libusb.h>
+#endif
+
 #include <condition_variable>
 
 #include <QObject>

diff --git a/Software/LibreCAL-GUI/usbdevice.h b/Software/LibreCAL-GUI/usbdevice.h
@@ -3,7 +3,13 @@
 
 #include "Util/usbinbuffer.h"
 
+#include <QtGlobal>
+#ifdef Q_OS_MACOS
+#include <libusb.h>
+#else
 #include <libusb-1.0/libusb.h>
+#endif
+
 #include <QString>
 #include <set>
 #include <functional>