Merge remote-tracking branch 'origin/dev' into improved_cli

flipperdevices · Jan 10, 2024 · e39ac66 · e39ac66
2 parents c189369 + 51196a2
commit e39ac66
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
           retention-days: 1
 
   build_mac:
-    runs-on: [self-hosted, ARM64, macOS]
+    runs-on: [self-hosted, ARM64, macOS, qFlipper]
     env:
       MAC_OS_KEYCHAIN_NAME: ${{ secrets.MAC_OS_KEYCHAIN_NAME }}
       MAC_OS_KEYCHAIN_PASSWORD: ${{ secrets.MAC_OS_KEYCHAIN_PASSWORD }}
@@ -61,7 +61,7 @@ jobs:
         run: ./build_mac.sh
 
       - name: Publish application
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: qflipper.dmg
           path: |
@@ -84,7 +84,7 @@ jobs:
         run: .\build_windows.bat
 
       - name: Publish application
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: qFlipperSetup-64bit.exe
           path: |

diff --git a/build_mac.sh b/build_mac.sh
@@ -49,7 +49,8 @@ qmake \
     CONFIG+="release qtquickcompiler" \
     -o Makefile \
     ../$PROJECT.pro \
-    QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64";
+    QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" \
+    -early QMAKE_DEFAULT_LIBDIRS="$(xcrun -show-sdk-path)/usr/lib";
 
 make qmake_all;
 make "-j$(sysctl -n hw.ncpu)" > /dev/null 2>&1;