From 295523265674f09f6d0475f3767967f993081e83 Mon Sep 17 00:00:00 2001 From: Giovanni Mascellani Date: Fri, 20 Oct 2023 21:39:41 +0200 Subject: [PATCH] ci: Allow the artifact copy to fail. If the build fails some artifact files might not exist, and we don't want the script to fail just because of that. --- gitlab/build-crosstest | 2 +- gitlab/build-linux | 2 +- gitlab/build-mac | 2 +- gitlab/build-mingw | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index da59bc8d..4e6c5b65 100755 --- a/gitlab/build-crosstest +++ b/gitlab/build-crosstest @@ -19,7 +19,7 @@ cd build touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr config.log tests/*.txt tests/*.exe ../artifacts/$COMMIT +rsync -Rr config.log tests/*.txt tests/*.exe ../artifacts/$COMMIT || true # Make the driver easily available to the Windows CI job cp tests/driver.cross64.exe ../artifacts diff --git a/gitlab/build-linux b/gitlab/build-linux index ee00e61e..545601bc 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -18,6 +18,6 @@ export LD_LIBRARY_PATH=/usr/local/lib touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT +rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true git reset --hard diff --git a/gitlab/build-mac b/gitlab/build-mac index 854bc8e3..6a795d02 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -17,6 +17,6 @@ cd build touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT +rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true git reset --hard diff --git a/gitlab/build-mingw b/gitlab/build-mingw index 1334a18a..0886de2c 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -19,7 +19,7 @@ cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-header touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -cp config.log ../artifacts/$COMMIT -cp destdir/usr/local/bin/* ../artifacts/$COMMIT +cp config.log ../artifacts/$COMMIT || true +cp destdir/usr/local/bin/* ../artifacts/$COMMIT || true git reset --hard