wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

ci: Assume an Apple Silicon-based environment for the macOS CI job.

Browse Source 
The previous Intel-based macOS runner was replaced with another one
running as a virtual machine on top of an Apple Silicon host.

Since the current macOS runner is not yet able to deal with
different exit codes, we temporarily allow failure unconditionally.
This will be reverted as soon as the runner issue is fixed.
This commit is contained in:
Giovanni Mascellani
2024-06-12 15:51:22 +02:00
committed by Henri Verbeet
parent d3ba810c98
commit 46a1b66df7
Notes: Henri Verbeet 2024-06-17 13:03:00 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/920
4 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gitlab/image.yml
View File

@@ -31,24 +31,38 @@ image-mac:
- .gitlab-ci.yml
- gitlab/image.yml
- gitlab/image.docker
image: winehq-sonoma-pristine
variables:
TART_EXECUTOR_SSH_USERNAME: "gitlab"
TART_EXECUTOR_SSH_PASSWORD: "gitlab"
interruptible: true
tags:
- mac
script:
- mkdir image
- cd image
- mkdir bin
- mkdir image/bin
- mkdir image/moltenvk
- export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
- git clone --depth 1 --branch v1.2.9 https://github.com/KhronosGroup/MoltenVK.git
- cd MoltenVK
- ./fetchDependencies --macos
- make macos
# Do not mark MoltenVK as a portability driver, otherwise it will be harder for vkd3d to find
# it. Since editing JSON properly is hard, we just rename the key.
- 'sed -i -e "s|is_portability_driver|_is_portability_driver|g" Package/Release/MoltenVK/dylib/macOS/MoltenVK_icd.json'
- cd ..
- cp MoltenVK/Package/Release/MoltenVK/dylib/macOS/MoltenVK_icd.json image/moltenvk
- cp MoltenVK/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib image/moltenvk
- git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git
- cd wine
- mkdir build
- cd build
- ../configure --enable-win64 --without-x --without-freetype
- make tools/widl/widl
- arch -x86_64 ../configure --enable-win64 --without-x --without-freetype
- arch -x86_64 make tools/widl/widl
- cd ../..
- cp wine/build/tools/widl/widl bin
- rm -fr wine
- cd ..
- cp wine/build/tools/widl/widl image/bin
artifacts:
paths:
- image