mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2024-09-13 09:16:14 -07:00
ci: Expect builds to always succeed, even when tests are allowed to fail.
This commit is contained in:
parent
f0a6c7de1d
commit
f8fcfc52d8
Notes:
Alexandre Julliard
2023-11-07 22:40:42 +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/449
@ -12,10 +12,13 @@ rm -fr build
|
|||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
export LD_LIBRARY_PATH=/usr/local/lib
|
export LD_LIBRARY_PATH=/usr/local/lib
|
||||||
../configure --enable-demos DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \
|
if ../configure --enable-demos DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \
|
||||||
make -j$(nproc) && \
|
make -j$(nproc) ; then
|
||||||
make -j$(nproc) check || \
|
make -j$(nproc) check || \
|
||||||
touch ../pipeline_failed
|
touch ../tests_failed
|
||||||
|
else
|
||||||
|
touch ../build_failed
|
||||||
|
fi
|
||||||
|
|
||||||
mkdir -p ../artifacts/$COMMIT
|
mkdir -p ../artifacts/$COMMIT
|
||||||
rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true
|
rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true
|
||||||
|
@ -11,10 +11,13 @@ set -Eeuxo pipefail
|
|||||||
rm -fr build
|
rm -fr build
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Wno-enum-conversion -Werror" && \
|
if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Wno-enum-conversion -Werror" && \
|
||||||
make -j$(sysctl -n hw.ncpu) && \
|
make -j$(sysctl -n hw.ncpu) ; then
|
||||||
make -j$(sysctl -n hw.ncpu) check || \
|
make -j$(sysctl -n hw.ncpu) check || \
|
||||||
touch ../pipeline_failed
|
touch ../tests_failed
|
||||||
|
else
|
||||||
|
touch ../build_failed
|
||||||
|
fi
|
||||||
|
|
||||||
mkdir -p ../artifacts/$COMMIT
|
mkdir -p ../artifacts/$COMMIT
|
||||||
rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true
|
rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true
|
||||||
|
@ -18,7 +18,8 @@
|
|||||||
- cat /proc/meminfo > artifacts/meminfo.txt
|
- cat /proc/meminfo > artifacts/meminfo.txt
|
||||||
- vulkaninfo > artifacts/vulkaninfo.txt
|
- vulkaninfo > artifacts/vulkaninfo.txt
|
||||||
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-linux
|
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-linux
|
||||||
- if [ -f pipeline_failed ] ; then exit 1 ; fi
|
- if [ -f build_failed ] ; then exit 1 ; fi
|
||||||
|
- if [ -f tests_failed ] ; then exit 2 ; fi
|
||||||
artifacts:
|
artifacts:
|
||||||
when: always
|
when: always
|
||||||
paths:
|
paths:
|
||||||
@ -34,7 +35,9 @@ build-radv-64:
|
|||||||
|
|
||||||
build-llvmpipe-64:
|
build-llvmpipe-64:
|
||||||
extends: .build-linux
|
extends: .build-linux
|
||||||
allow_failure: true
|
allow_failure:
|
||||||
|
exit_codes:
|
||||||
|
- 2
|
||||||
variables:
|
variables:
|
||||||
VK_LOADER_DRIVERS_SELECT: 'lvp_*'
|
VK_LOADER_DRIVERS_SELECT: 'lvp_*'
|
||||||
VKD3D_SHADER_CONFIG: 'force_validation'
|
VKD3D_SHADER_CONFIG: 'force_validation'
|
||||||
@ -50,7 +53,9 @@ build-radv-32:
|
|||||||
|
|
||||||
build-llvmpipe-32:
|
build-llvmpipe-32:
|
||||||
extends: .build-linux
|
extends: .build-linux
|
||||||
allow_failure: true
|
allow_failure:
|
||||||
|
exit_codes:
|
||||||
|
- 2
|
||||||
variables:
|
variables:
|
||||||
VK_LOADER_DRIVERS_SELECT: 'lvp_*'
|
VK_LOADER_DRIVERS_SELECT: 'lvp_*'
|
||||||
CC: 'gcc -m32'
|
CC: 'gcc -m32'
|
||||||
@ -121,7 +126,9 @@ build-mac:
|
|||||||
stage: build
|
stage: build
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
||||||
allow_failure: true
|
allow_failure:
|
||||||
|
exit_codes:
|
||||||
|
- 2
|
||||||
interruptible: true
|
interruptible: true
|
||||||
needs: []
|
needs: []
|
||||||
dependencies: []
|
dependencies: []
|
||||||
@ -149,7 +156,8 @@ build-mac:
|
|||||||
- cd ../..
|
- cd ../..
|
||||||
- export PATH="$PWD/wine/build/tools/widl:$PATH"
|
- 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 pipeline_failed ] ; then exit 1 ; fi
|
- if [ -f build_failed ] ; then exit 1 ; fi
|
||||||
|
- if [ -f tests_failed ] ; then exit 2 ; fi
|
||||||
variables:
|
variables:
|
||||||
VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing"
|
VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing"
|
||||||
VKD3D_SHADER_CONFIG: 'force_validation'
|
VKD3D_SHADER_CONFIG: 'force_validation'
|
||||||
|
Loading…
Reference in New Issue
Block a user