mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2024-11-21 16:46:41 -08:00
ci: Use widl from the mingw-w64 brew package on macOS.
This commit is contained in:
parent
51cdb74061
commit
2b84e30e26
Notes:
Henri Verbeet
2024-10-17 17:40:01 +02:00
Approved-by: Giovanni Mascellani (@giomasce) Approved-by: Henri Verbeet (@hverbeet) Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1192
@ -147,7 +147,7 @@ build-mac:
|
|||||||
tags:
|
tags:
|
||||||
- mac
|
- mac
|
||||||
script:
|
script:
|
||||||
- brew install vulkan-tools libtool spirv-headers vulkan-loader
|
- brew install vulkan-tools libtool spirv-headers vulkan-loader mingw-w64
|
||||||
- git config --global --add safe.directory $CI_PROJECT_DIR
|
- git config --global --add safe.directory $CI_PROJECT_DIR
|
||||||
- git clean -fdx
|
- git clean -fdx
|
||||||
- git reset --hard
|
- git reset --hard
|
||||||
@ -155,7 +155,7 @@ build-mac:
|
|||||||
- curl -o image.zip https://gitlab.winehq.org/api/v4/projects/wine%2Fvkd3d/jobs/artifacts/master/download?job=image-mac
|
- curl -o image.zip https://gitlab.winehq.org/api/v4/projects/wine%2Fvkd3d/jobs/artifacts/master/download?job=image-mac
|
||||||
- unzip image.zip
|
- unzip image.zip
|
||||||
- mkdir artifacts
|
- mkdir artifacts
|
||||||
- export PATH="/opt/homebrew/opt/bison/bin:/opt/homebrew/opt/flex/bin:$PWD/image/bin:$PATH"
|
- export PATH="/opt/homebrew/opt/bison/bin:/opt/homebrew/opt/flex/bin:$PATH"
|
||||||
- export VK_DRIVER_FILES="$PWD/image/moltenvk/MoltenVK_icd.json"
|
- export VK_DRIVER_FILES="$PWD/image/moltenvk/MoltenVK_icd.json"
|
||||||
- system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt
|
- system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt
|
||||||
- vulkaninfo > artifacts/vulkaninfo.txt
|
- vulkaninfo > artifacts/vulkaninfo.txt
|
||||||
@ -167,6 +167,7 @@ build-mac:
|
|||||||
VKD3D_SHADER_CONFIG: 'force_validation'
|
VKD3D_SHADER_CONFIG: 'force_validation'
|
||||||
MVK_CONFIG_LOG_LEVEL: 2
|
MVK_CONFIG_LOG_LEVEL: 2
|
||||||
SONAME_LIBVULKAN: "/opt/homebrew/opt/vulkan-loader/lib/libvulkan.1.dylib"
|
SONAME_LIBVULKAN: "/opt/homebrew/opt/vulkan-loader/lib/libvulkan.1.dylib"
|
||||||
|
WIDL: "x86_64-w64-mingw32-widl"
|
||||||
artifacts:
|
artifacts:
|
||||||
when: always
|
when: always
|
||||||
paths:
|
paths:
|
||||||
|
Loading…
Reference in New Issue
Block a user