Updated CI pipeline build for MacOS
parent
840ded7e61
commit
fd81641cf7
|
@ -98,12 +98,10 @@ jobs:
|
||||||
- name: Create build directory
|
- name: Create build directory
|
||||||
run: cmake -E make_directory build
|
run: cmake -E make_directory build
|
||||||
- name: Run CMake (for Mac)
|
- name: Run CMake (for Mac)
|
||||||
working-directory: build
|
run: cmake --preset MacOS-CI
|
||||||
run: cmake -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_SKIP_INSTALL_RPATH=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDEV_BUILD=1 -DPORTABLE=1 -DTESTS=1 -DDESKTOP=1 -DOPENAL_LIBRARY=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/OpenAL.framework/OpenAL.tbd ..
|
|
||||||
if: matrix.target_os == 'macos'
|
if: matrix.target_os == 'macos'
|
||||||
- name: Build
|
- name: Build
|
||||||
working-directory: build
|
run: cmake --build --preset MacOS-CI
|
||||||
run: make -j `nproc`
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
# TODO: Maybe run Windows tests using wine as well?
|
# TODO: Maybe run Windows tests using wine as well?
|
||||||
working-directory: build
|
working-directory: build
|
||||||
|
|
|
@ -47,6 +47,20 @@
|
||||||
"TESTS": true,
|
"TESTS": true,
|
||||||
"DESKTOP": true
|
"DESKTOP": true
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "MacOS-CI",
|
||||||
|
"description": "MacOS configuration for CI pipeline",
|
||||||
|
"inherits": ["CI"],
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_SKIP_INSTALL_RPATH": true,
|
||||||
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
|
||||||
|
"DEV_BUILD": true,
|
||||||
|
"PORTABLE": true,
|
||||||
|
"TESTS": true,
|
||||||
|
"DESKTOP": true,
|
||||||
|
"OPENAL_LIBRARY": "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/OpenAL.framework/OpenAL.tbd"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"buildPresets": [
|
"buildPresets": [
|
||||||
|
@ -59,6 +73,11 @@
|
||||||
"name": "Linux-CI",
|
"name": "Linux-CI",
|
||||||
"configurePreset": "Linux-CI",
|
"configurePreset": "Linux-CI",
|
||||||
"configuration": "RelWithDebInfo"
|
"configuration": "RelWithDebInfo"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "MacOS-CI",
|
||||||
|
"configurePreset": "MacOS-CI",
|
||||||
|
"configuration": "RelWithDebInfo"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue