Update build.yml
Hopefully fix linux build, add Apple Silicon build on MacOS14
This commit is contained in:
@@ -12,7 +12,7 @@ jobs:
|
||||
steps:
|
||||
- name: Prepare Environment
|
||||
run: |
|
||||
sudo apt-get install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-randr0 libxkbcommon-x11-0
|
||||
sudo apt-get install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-randr0 libxkbcommon-x11-0 libfuse2
|
||||
|
||||
- name: Prepare Qt Libraries
|
||||
uses: jurplel/install-qt-action@v3
|
||||
@@ -37,7 +37,7 @@ jobs:
|
||||
name: SavvyCAN-Linux_x64.AppImage
|
||||
path: SavvyCAN-*x86_64.AppImage
|
||||
|
||||
buildmacos:
|
||||
buildmacos86:
|
||||
name: macOS x64
|
||||
runs-on: macos-13
|
||||
|
||||
@@ -65,6 +65,35 @@ jobs:
|
||||
with:
|
||||
name: SavvyCAN-macOS_x64.dmg
|
||||
path: SavvyCAN.dmg
|
||||
|
||||
buildmacos-arm64:
|
||||
name: macOS ARM64
|
||||
runs-on: macos-14
|
||||
|
||||
steps:
|
||||
- name: Prepare macOS Environment
|
||||
run: |
|
||||
brew install qt5
|
||||
brew link qt5 --force
|
||||
|
||||
- name: Clone
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Compile
|
||||
run: |
|
||||
qmake CONFIG+=release CONFIG+=sdk_no_version_check SavvyCAN.pro
|
||||
make -j`sysctl kern.aioprocmax | awk '{print $2}'`
|
||||
|
||||
- name: Package
|
||||
run: |
|
||||
mkdir -p SavvyCAN.app/Contents/MacOS/help
|
||||
cp -R help/* SavvyCAN.app/Contents/MacOS/help
|
||||
macdeployqt SavvyCAN.app -dmg
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: SavvyCAN-macOS_ARM64.dmg
|
||||
path: SavvyCAN.dmg
|
||||
|
||||
buildwindows:
|
||||
name: Windows x64
|
||||
@@ -120,7 +149,7 @@ jobs:
|
||||
pre-release:
|
||||
name: "pre-release"
|
||||
runs-on: "ubuntu-latest"
|
||||
needs: [buildwindows, buildmacos, buildlinux]
|
||||
needs: [buildwindows, buildmacos86, buildmacos-arm64, buildlinux]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
@@ -139,11 +168,12 @@ jobs:
|
||||
SavvyCAN-Linux_x64.AppImage/SavvyCAN-*x86_64.AppImage
|
||||
SavvyCAN-Windows_x64_CIBuild.zip
|
||||
SavvyCAN-macOS_x64.dmg/SavvyCAN.dmg
|
||||
SavvyCAN-macOS_ARM64.dmg/SavvyCAN.dmg
|
||||
|
||||
notify:
|
||||
name: Notify Discord
|
||||
runs-on: ubuntu-latest
|
||||
needs: [buildwindows, buildmacos, buildlinux]
|
||||
needs: [buildwindows, buildmacos86, buildmacos-arm64, buildlinux]
|
||||
steps:
|
||||
- id: msg_var
|
||||
name: remove newlines
|
||||
|
||||
Reference in New Issue
Block a user