Module: Mesa Branch: main Commit: a3ae424e0c065c98d91bff6f201f6d1536288eaf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3ae424e0c065c98d91bff6f201f6d1536288eaf
Author: David Heidelberg <[email protected]> Date: Wed Apr 26 10:51:20 2023 +0200 ci/skqp: replace license with SPDX and extract the used branch Reviewed-by: Eric Engestrom <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22710> --- .gitlab-ci/container/build-skqp.sh | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh index 6ab90fca71b..bbb81c96760 100755 --- a/.gitlab-ci/container/build-skqp.sh +++ b/.gitlab-ci/container/build-skqp.sh @@ -1,27 +1,14 @@ -#!/bin/bash +#!/usr/bin/env bash +# SPDX-License-Identifier: MIT # -# Copyright (C) 2022 Collabora Limited +# Copyright © 2022 Collabora Limited # Author: Guilherme Gallo <[email protected]> # -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. +# When changing this file, you need to bump the following +# .gitlab-ci/image-tags.yml tags: +# KERNEL_ROOTFS_TAG +SKQP_BRANCH=android-cts-11.0_r7 create_gn_args() { # gn can be configured to cross-compile skia and its tools @@ -41,7 +28,6 @@ download_skia_source() { # Skia cloned from https://android.googlesource.com/platform/external/skqp # has all needed assets tracked on git-fs SKQP_REPO=https://android.googlesource.com/platform/external/skqp - SKQP_BRANCH=android-cts-11.0_r7 git clone --branch "${SKQP_BRANCH}" --depth 1 "${SKQP_REPO}" "${SKIA_DIR}" }
