From 15136efedc8067ffcb8b8b6df9cef53679664f80 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 27 Aug 2024 10:15:31 -0400 Subject: ci: Add IAR compiler package dependencies to Debian image --- .gitlab/ci/docker/debian12-x86_64/deps_packages.lst | 5 +++++ .gitlab/os-linux.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/docker/debian12-x86_64/deps_packages.lst b/.gitlab/ci/docker/debian12-x86_64/deps_packages.lst index 014c7ea..21d25f0 100644 --- a/.gitlab/ci/docker/debian12-x86_64/deps_packages.lst +++ b/.gitlab/ci/docker/debian12-x86_64/deps_packages.lst @@ -41,6 +41,11 @@ hipcc # Install swift runtime deps. libncurses5 +# Install IAR compiler package dependencies. +libusb-1.0-0 +udev +sudo + # Packages needed to test find modules. alsa-utils doxygen graphviz diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 11d703a..7b95516 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -45,7 +45,7 @@ ### Debian .debian12: - image: "kitware/cmake:ci-debian12-x86_64-2024-03-04" + image: "kitware/cmake:ci-debian12-x86_64-2024-08-27" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" -- cgit v0.12 From 61039ae8f12433a4ecc93086dc440a6d61aa9cee Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 28 Aug 2024 10:55:29 -0400 Subject: ci: Enable IAR test on some Debian jobs in nightly pipeline Closes: #23308 --- .../ci/configure_debian12_makefiles_clang.cmake | 1 + .gitlab/ci/configure_debian12_ninja_clang.cmake | 1 + .../configure_debian12_ninja_multi_symlinked.cmake | 4 +++ .gitlab/ci/env_debian12_makefiles_clang.sh | 1 + .gitlab/ci/env_debian12_ninja_clang.sh | 1 + .gitlab/ci/env_debian12_ninja_multi_symlinked.sh | 4 +++ .gitlab/ci/iar-env.sh | 33 ++++++++++++++++++++++ 7 files changed, 45 insertions(+) create mode 100644 .gitlab/ci/iar-env.sh diff --git a/.gitlab/ci/configure_debian12_makefiles_clang.cmake b/.gitlab/ci/configure_debian12_makefiles_clang.cmake index 7cba6f3..9bd6275 100644 --- a/.gitlab/ci/configure_debian12_makefiles_clang.cmake +++ b/.gitlab/ci/configure_debian12_makefiles_clang.cmake @@ -2,6 +2,7 @@ set(CMake_TEST_C_STANDARDS "90;99;11;17;23" CACHE STRING "") set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23" CACHE STRING "") if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_IAR_TOOLCHAINS "/opt/iarsystems" CACHE PATH "") set(CMake_TEST_TICLANG_TOOLCHAINS "$ENV{CI_PROJECT_DIR}/.gitlab/ticlang" CACHE PATH "") endif() diff --git a/.gitlab/ci/configure_debian12_ninja_clang.cmake b/.gitlab/ci/configure_debian12_ninja_clang.cmake index 69f1e7c..1a8e192 100644 --- a/.gitlab/ci/configure_debian12_ninja_clang.cmake +++ b/.gitlab/ci/configure_debian12_ninja_clang.cmake @@ -1,4 +1,5 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_IAR_TOOLCHAINS "/opt/iarsystems" CACHE PATH "") set(CMake_TEST_TICLANG_TOOLCHAINS "$ENV{CI_PROJECT_DIR}/.gitlab/ticlang" CACHE PATH "") endif() diff --git a/.gitlab/ci/configure_debian12_ninja_multi_symlinked.cmake b/.gitlab/ci/configure_debian12_ninja_multi_symlinked.cmake index cf9202d..646dac8 100644 --- a/.gitlab/ci/configure_debian12_ninja_multi_symlinked.cmake +++ b/.gitlab/ci/configure_debian12_ninja_multi_symlinked.cmake @@ -1,3 +1,7 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_IAR_TOOLCHAINS "/opt/iarsystems" CACHE PATH "") +endif() + include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_debian12_ninja_common.cmake") set(CMake_TEST_UseSWIG "OFF" CACHE BOOL "") diff --git a/.gitlab/ci/env_debian12_makefiles_clang.sh b/.gitlab/ci/env_debian12_makefiles_clang.sh index e46aa29..e4ee249 100644 --- a/.gitlab/ci/env_debian12_makefiles_clang.sh +++ b/.gitlab/ci/env_debian12_makefiles_clang.sh @@ -1,4 +1,5 @@ if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/iar-env.sh source .gitlab/ci/ticlang-env.sh fi diff --git a/.gitlab/ci/env_debian12_ninja_clang.sh b/.gitlab/ci/env_debian12_ninja_clang.sh index e46aa29..e4ee249 100644 --- a/.gitlab/ci/env_debian12_ninja_clang.sh +++ b/.gitlab/ci/env_debian12_ninja_clang.sh @@ -1,4 +1,5 @@ if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/iar-env.sh source .gitlab/ci/ticlang-env.sh fi diff --git a/.gitlab/ci/env_debian12_ninja_multi_symlinked.sh b/.gitlab/ci/env_debian12_ninja_multi_symlinked.sh index 2b8ff2a..5734117 100644 --- a/.gitlab/ci/env_debian12_ninja_multi_symlinked.sh +++ b/.gitlab/ci/env_debian12_ninja_multi_symlinked.sh @@ -1,5 +1,9 @@ export MY_RUBY_HOME="/usr/local/rvm/rubies/ruby-3.2.2" +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/iar-env.sh +fi + if test -z "$CI_MERGE_REQUEST_ID"; then source .gitlab/ci/swift-env.sh fi diff --git a/.gitlab/ci/iar-env.sh b/.gitlab/ci/iar-env.sh new file mode 100644 index 0000000..9bf0672 --- /dev/null +++ b/.gitlab/ci/iar-env.sh @@ -0,0 +1,33 @@ +# FIXME(#26249): Testing fails with RH850 tooling. +# bxrh850-3.10.2.deb +files=' +bxarm-9.50.2.deb +bxavr-8.10.2.deb +bxriscv-3.30.1.deb +bxrl78-5.10.3.deb +bxrx-5.10.1.deb +' +for f in $files; do + # This URL is only visible inside of Kitware's network. + curl -OJLs https://cmake.org/files/dependencies/internal/iar/$f +done + +echo ' +cb6a276ace472939fbb76fc5ce517149296ac2c87047b59504f9fe95aed81794 bxarm-9.50.2.deb +4a1065291952a23a8bfbbaa4eb36ca49b0af8653b8faab34ce955d9d48d64506 bxavr-8.10.2.deb +#b14085a0f21750c58168125d3cece2e3fcbd4c6495c652b5e65b6637bac0ac31 bxrh850-3.10.2.deb +517e18dffdd4345f97c480b5128c7feea25ec1c3f06e62d8e2e6808c401d514a bxriscv-3.30.1.deb +3deca7f6afd5f47684464ad748334ab0690097a109d9c680603450074fc32ccf bxrl78-5.10.3.deb +260e592c48cbaf902b13bdb2feeeba83068978131fcb5c027dab17e715dec7e7 bxrx-5.10.1.deb +' > bxdebs.sha256sum +sha256sum --check bxdebs.sha256sum + +dpkg -i bx*.deb +rm bx*.deb bxdebs.sha256sum + +find /opt/iarsystems -executable -wholename "*bin/icc*" + +if test -n "$CMAKE_CI_IAR_LICENSE_SERVER"; then + find /opt/iarsystems -executable -wholename '*bin/lightlicensemanager' -exec {} setup --host "$CMAKE_CI_IAR_LICENSE_SERVER" ';' + find /opt/iarsystems -executable -wholename "*bin/icc*" -exec {} --version ';' +fi -- cgit v0.12