From: Giovanni Mascellani gmascellani@codeweavers.com
--- gitlab/build.yml | 1 + 1 file changed, 1 insertion(+)
diff --git a/gitlab/build.yml b/gitlab/build.yml index 75dc27fd..a139d15a 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -17,6 +17,7 @@ - cat /proc/cpuinfo > artifacts/cpuinfo.txt - cat /proc/meminfo > artifacts/meminfo.txt - vulkaninfo > artifacts/vulkaninfo.txt + - rm -fr .git/rebase-merge - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-linux - if [ -f pipeline_failed ] ; then exit 1 ; fi artifacts: