mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2024-09-13 09:16:14 -07:00
ci: Prepare the macOS build environment in a dedicated CI job.
This commit is contained in:
parent
847930d5e0
commit
866e5de95b
Notes:
Alexandre Julliard
2024-01-18 23:19:27 +01:00
Approved-by: Giovanni Mascellani (@giomasce) Approved-by: Henri Verbeet (@hverbeet) Approved-by: Alexandre Julliard (@julliard) Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/538
@ -130,7 +130,9 @@ build-mac:
|
|||||||
exit_codes:
|
exit_codes:
|
||||||
- 2
|
- 2
|
||||||
interruptible: true
|
interruptible: true
|
||||||
needs: []
|
needs:
|
||||||
|
- job: image-mac
|
||||||
|
optional: true
|
||||||
dependencies: []
|
dependencies: []
|
||||||
tags:
|
tags:
|
||||||
- mac
|
- mac
|
||||||
@ -147,14 +149,9 @@ build-mac:
|
|||||||
- system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt
|
- system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt
|
||||||
- vulkaninfo > artifacts/vulkaninfo.txt
|
- vulkaninfo > artifacts/vulkaninfo.txt
|
||||||
- export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
|
- export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
|
||||||
- git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git
|
- curl -o image.zip https://gitlab.winehq.org/api/v4/projects/wine%2Fvkd3d/jobs/artifacts/master/download?job=image-mac
|
||||||
- cd wine
|
- unzip image.zip
|
||||||
- mkdir build
|
- export PATH="$PWD/image/bin:$PATH"
|
||||||
- cd build
|
|
||||||
- ../configure --enable-win64 --without-x --without-freetype
|
|
||||||
- make tools/widl/widl
|
|
||||||
- cd ../..
|
|
||||||
- export PATH="$PWD/wine/build/tools/widl:$PATH"
|
|
||||||
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac
|
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac
|
||||||
- if [ -f build_failed ] ; then exit 1 ; fi
|
- if [ -f build_failed ] ; then exit 1 ; fi
|
||||||
- if [ -f tests_failed ] ; then exit 2 ; fi
|
- if [ -f tests_failed ] ; then exit 2 ; fi
|
||||||
|
@ -18,3 +18,32 @@ image-linux:
|
|||||||
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"auth\":\"$(printf "%s:%s" "$CI_DEPENDENCY_PROXY_USER" "$CI_DEPENDENCY_PROXY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
|
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"auth\":\"$(printf "%s:%s" "$CI_DEPENDENCY_PROXY_USER" "$CI_DEPENDENCY_PROXY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
|
||||||
- sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE"
|
- sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE"
|
||||||
- /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL"
|
- /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL"
|
||||||
|
|
||||||
|
image-mac:
|
||||||
|
stage: image
|
||||||
|
rules:
|
||||||
|
- if: $CI_PIPELINE_SOURCE == 'push' && $CI_PROJECT_PATH == "wine/vkd3d" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||||
|
changes:
|
||||||
|
- .gitlab-ci.yml
|
||||||
|
- gitlab/image.yml
|
||||||
|
interruptible: true
|
||||||
|
tags:
|
||||||
|
- mac
|
||||||
|
script:
|
||||||
|
- mkdir image
|
||||||
|
- cd image
|
||||||
|
- mkdir bin
|
||||||
|
- export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
|
||||||
|
- 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
|
||||||
|
- cd ../..
|
||||||
|
- cp wine/build/tools/widl/widl bin
|
||||||
|
- rm -fr wine
|
||||||
|
- cd ..
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- image
|
||||||
|
Loading…
Reference in New Issue
Block a user