From 5acdef547ee079c38b936d22b68b9c62dad5254b Mon Sep 17 00:00:00 2001 From: Deborah Brouwer Date: Tue, 1 Oct 2024 14:09:21 -0700 Subject: [PATCH] ci/deqp-runner: fix option to build from a commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the 'git clone --branch' option only accepts branch names or tags as arguments, it’s not currently possible to build deqp-runner directly from a git commit hash. Revise the deqp-runner build script so that it can build from a commit even if it doesn’t have a tag or version number. Part-of: --- .gitlab-ci/container/build-deqp-runner.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh index c12bd840f3e..1bda22fe8b8 100644 --- a/.gitlab-ci/container/build-deqp-runner.sh +++ b/.gitlab-ci/container/build-deqp-runner.sh @@ -32,8 +32,12 @@ BASE_PWD=$PWD mkdir -p /deqp-runner pushd /deqp-runner -git clone --branch "$DEQP_RUNNER_GIT_CHECKOUT" --depth 1 "$DEQP_RUNNER_GIT_URL" deqp-runner-git +mkdir deqp-runner-git pushd deqp-runner-git +git init +git remote add origin "$DEQP_RUNNER_GIT_URL" +git fetch --depth 1 origin "$DEQP_RUNNER_GIT_CHECKOUT" +git checkout FETCH_HEAD for commit in "${commits_to_backport[@]}" do