From 87e6703b67a2b34847c205122af6570628b573f0 Mon Sep 17 00:00:00 2001
From: Helen Koike <helen.koike@collabora.com>
Date: Thu, 1 Dec 2022 20:24:12 -0300
Subject: [PATCH] ci: move patches to patches directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Group all patches in a directory.
Improve organization to organize the current and future patches.

Signed-off-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Sergi Blanch Torné <sergi.blanch.torne@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20019>
---
 .gitlab-ci/container/build-skqp.sh                              | 2 +-
 .gitlab-ci/container/{ => patches}/build-skqp_BUILD.gn.patch    | 0
 .gitlab-ci/container/{ => patches}/build-skqp_fetch_gn.patch    | 0
 .../container/{ => patches}/build-skqp_git-sync-deps.patch      | 0
 .gitlab-ci/container/{ => patches}/build-skqp_gl.patch          | 0
 .gitlab-ci/container/{ => patches}/build-skqp_is_clang.py.patch | 0
 .gitlab-ci/container/{ => patches}/build-skqp_nima.patch        | 0
 7 files changed, 1 insertion(+), 1 deletion(-)
 rename .gitlab-ci/container/{ => patches}/build-skqp_BUILD.gn.patch (100%)
 rename .gitlab-ci/container/{ => patches}/build-skqp_fetch_gn.patch (100%)
 rename .gitlab-ci/container/{ => patches}/build-skqp_git-sync-deps.patch (100%)
 rename .gitlab-ci/container/{ => patches}/build-skqp_gl.patch (100%)
 rename .gitlab-ci/container/{ => patches}/build-skqp_is_clang.py.patch (100%)
 rename .gitlab-ci/container/{ => patches}/build-skqp_nima.patch (100%)

diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh
index c91dfda33bb..6ab90fca71b 100755
--- a/.gitlab-ci/container/build-skqp.sh
+++ b/.gitlab-ci/container/build-skqp.sh
@@ -49,7 +49,7 @@ download_skia_source() {
 set -ex
 
 SCRIPT_DIR=$(realpath "$(dirname "$0")")
-SKQP_PATCH_DIR="${SCRIPT_DIR}"
+SKQP_PATCH_DIR="${SCRIPT_DIR}/patches"
 BASE_ARGS_GN_FILE="${SCRIPT_DIR}/build-skqp_base.gn"
 
 SKQP_ARCH=${SKQP_ARCH:-x64}
diff --git a/.gitlab-ci/container/build-skqp_BUILD.gn.patch b/.gitlab-ci/container/patches/build-skqp_BUILD.gn.patch
similarity index 100%
rename from .gitlab-ci/container/build-skqp_BUILD.gn.patch
rename to .gitlab-ci/container/patches/build-skqp_BUILD.gn.patch
diff --git a/.gitlab-ci/container/build-skqp_fetch_gn.patch b/.gitlab-ci/container/patches/build-skqp_fetch_gn.patch
similarity index 100%
rename from .gitlab-ci/container/build-skqp_fetch_gn.patch
rename to .gitlab-ci/container/patches/build-skqp_fetch_gn.patch
diff --git a/.gitlab-ci/container/build-skqp_git-sync-deps.patch b/.gitlab-ci/container/patches/build-skqp_git-sync-deps.patch
similarity index 100%
rename from .gitlab-ci/container/build-skqp_git-sync-deps.patch
rename to .gitlab-ci/container/patches/build-skqp_git-sync-deps.patch
diff --git a/.gitlab-ci/container/build-skqp_gl.patch b/.gitlab-ci/container/patches/build-skqp_gl.patch
similarity index 100%
rename from .gitlab-ci/container/build-skqp_gl.patch
rename to .gitlab-ci/container/patches/build-skqp_gl.patch
diff --git a/.gitlab-ci/container/build-skqp_is_clang.py.patch b/.gitlab-ci/container/patches/build-skqp_is_clang.py.patch
similarity index 100%
rename from .gitlab-ci/container/build-skqp_is_clang.py.patch
rename to .gitlab-ci/container/patches/build-skqp_is_clang.py.patch
diff --git a/.gitlab-ci/container/build-skqp_nima.patch b/.gitlab-ci/container/patches/build-skqp_nima.patch
similarity index 100%
rename from .gitlab-ci/container/build-skqp_nima.patch
rename to .gitlab-ci/container/patches/build-skqp_nima.patch