From 146edd2f4c99c89d13b8e1f0c523a0a2805418b3 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Wed, 18 Oct 2023 15:31:30 +0200 Subject: [PATCH] chore(ci): having a variable to choose simde version Signed-off-by: Raphael Defosseux --- cmake_targets/tools/build_helper | 9 +++++++++ docker/Dockerfile.base.ubuntu20.cross-arm64 | 2 ++ 2 files changed, 11 insertions(+) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index d9237b57ba..648508eb63 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -685,6 +685,15 @@ install_simde_from_source(){ $SUDO rm -rf /tmp/simde git clone https://github.com/simd-everywhere/simde-no-tests.git /tmp/simde cd /tmp/simde + # we can specify a given version of SIMDE (sha-one or tag) + if [[ -v SIMDE_VERSION ]]; then + git checkout -f $SIMDE_VERSION + else + # At time of writing, last working commit for OAI + git checkout 389f360a66d4a3bec62b7d71ad8be877487809ba + fi + # Showing which version is used + git log -n1 # brute force copy into /usr/include $SUDO \cp -rv ../simde /usr/include } diff --git a/docker/Dockerfile.base.ubuntu20.cross-arm64 b/docker/Dockerfile.base.ubuntu20.cross-arm64 index 55ea35fa96..3f83b751af 100644 --- a/docker/Dockerfile.base.ubuntu20.cross-arm64 +++ b/docker/Dockerfile.base.ubuntu20.cross-arm64 @@ -29,6 +29,8 @@ FROM ubuntu:focal AS ran-base ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris +# Specifying a working version of SIMDE for ARM: +ENV SIMDE_VERSION=389f360a66d4a3bec62b7d71ad8be877487809ba #install developers pkg/repo RUN apt-get update && \