From d1174113093e35c429367dae31aed55f750b8224 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 18 Oct 2024 17:26:35 +0200 Subject: [PATCH] {freedreno,intel}/ci: add missing tracking of `merge-skips.txt` files Part-of: --- src/freedreno/ci/gitlab-ci-inc.yml | 1 + src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 1 + src/intel/ci/gitlab-ci-inc.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index b3d8cc29059..0784ddb4b12 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -10,6 +10,7 @@ - src/freedreno/ci/$GPU_VERSION-fails.txt - src/freedreno/ci/$GPU_VERSION-flakes.txt - src/freedreno/ci/$GPU_VERSION-skips.txt + - src/freedreno/ci/$GPU_VERSION-merge-skips.txt - src/freedreno/ci/$PIGLIT_TRACES_FILE - src/freedreno/ci/$GPU_VERSION-vkd3d-fails.txt - src/freedreno/ci/$GPU_VERSION-vkd3d-flakes.txt diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index e4f99bbf28a..d37598e72d0 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -11,6 +11,7 @@ - src/gallium/drivers/zink/ci/$GPU_VERSION-fails.txt - src/gallium/drivers/zink/ci/$GPU_VERSION-flakes.txt - src/gallium/drivers/zink/ci/$GPU_VERSION-skips.txt + - src/gallium/drivers/zink/ci/$GPU_VERSION-merge-skips.txt - src/gallium/drivers/zink/ci/$GPU_VERSION-validation-settings.txt - src/gallium/drivers/zink/ci/$PIGLIT_TRACES_FILE when: on_success diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index 1dcc017656d..1f09a16f749 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -19,6 +19,7 @@ - src/intel/ci/$GPU_VERSION-fails.txt - src/intel/ci/$GPU_VERSION-flakes.txt - src/intel/ci/$GPU_VERSION-skips.txt + - src/intel/ci/$GPU_VERSION-merge-skips.txt - src/intel/ci/$VK_DRIVER-skips.txt - src/intel/ci/$GALLIUM_DRIVER-skips.txt - src/intel/ci/$DRIVER_NAME-skips.txt