parent
bfce851d4d
commit
51196a2a6f
|
@ -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: |
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue