From 23732b47324b823146b61179b517517f32ea2048 Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Tue, 19 Jul 2022 23:47:44 -0300 Subject: [PATCH] ci/skqp: Fix Nima-Cpp fetching error Nima-Cpp is not available anymore inside googlesource, revert to github one Signed-off-by: Guilherme Gallo Part-of: --- .gitlab-ci/container/build-skqp.sh | 2 +- .gitlab-ci/container/build-skqp_nima.patch | 18 ++++++++++++++++++ .gitlab-ci/image-tags.yml | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 .gitlab-ci/container/build-skqp_nima.patch diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh index 56d13cf466b..0ee982388f1 100755 --- a/.gitlab-ci/container/build-skqp.sh +++ b/.gitlab-ci/container/build-skqp.sh @@ -55,7 +55,7 @@ BASE_ARGS_GN_FILE="${SCRIPT_DIR}/build-skqp_base.gn" SKQP_ARCH=${SKQP_ARCH:-x64} SKIA_DIR=${SKIA_DIR:-$(mktemp -d)} SKQP_OUT_DIR=${SKIA_DIR}/out/${SKQP_ARCH} -SKQP_INSTALL_DIR=/skqp +SKQP_INSTALL_DIR=${SKQP_INSTALL_DIR:-/skqp} SKQP_ASSETS_DIR="${SKQP_INSTALL_DIR}/assets" SKQP_BINARIES=(skqp) diff --git a/.gitlab-ci/container/build-skqp_nima.patch b/.gitlab-ci/container/build-skqp_nima.patch new file mode 100644 index 00000000000..a7ad032e3dd --- /dev/null +++ b/.gitlab-ci/container/build-skqp_nima.patch @@ -0,0 +1,18 @@ +Nima-Cpp is not available anymore inside googlesource, revert to github one +Simulates `git revert 49233d2521054037ded7d760427c4a0dc1e11356` + +diff --git a/DEPS b/DEPS +index 7e0b941..c88b064 100644 +--- a/DEPS ++++ b/DEPS +@@ -33,8 +33,8 @@ deps = { + #"third_party/externals/v8" : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4", + "third_party/externals/wuffs" : "https://skia.googlesource.com/external/github.com/google/wuffs.git@fda3c4c9863d9f9fcec58ae66508c4621fc71ea5", + "third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@47af7c547f8551bd25424e56354a2ae1e9062859", +- "third_party/externals/Nima-Cpp" : "https://skia.googlesource.com/external/github.com/2d-inc/Nima-Cpp.git@4bd02269d7d1d2e650950411325eafa15defb084", +- "third_party/externals/Nima-Math-Cpp" : "https://skia.googlesource.com/external/github.com/2d-inc/Nima-Math-Cpp.git@e0c12772093fa8860f55358274515b86885f0108", ++ "third_party/externals/Nima-Cpp" : "https://github.com/2d-inc/Nima-Cpp.git@4bd02269d7d1d2e650950411325eafa15defb084", ++ "third_party/externals/Nima-Math-Cpp" : "https://github.com/2d-inc/Nima-Math-Cpp.git@e0c12772093fa8860f55358274515b86885f0108", + + "../src": { + "url": "https://chromium.googlesource.com/chromium/src.git@ccf3465732e5d5363f0e44a8fac54550f62dd1d0", diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index c8ef24568e0..fc2e6dc56ee 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -15,7 +15,7 @@ variables: DEBIAN_X86_TEST_VK_TAG: "2022-08-04-deqp-runner" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" - KERNEL_ROOTFS_TAG: "2022-08-06-deqp-runner" + KERNEL_ROOTFS_TAG: "2022-08-08-skqp" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-06-15-vs-winsdk"