From d89f1cbc162ffaf746f117ccb05b44b3ca277d4e Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 3 Jun 2025 09:26:16 -0400 Subject: [PATCH] ci: Enable Emscripten test on some Debian jobs in nightly pipeline --- .gitlab/ci/configure_debian12_makefiles_clang.cmake | 1 + .gitlab/ci/configure_debian12_ninja_clang.cmake | 1 + .gitlab/ci/env_debian12_makefiles_clang.sh | 1 + .gitlab/ci/env_debian12_ninja_clang.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/.gitlab/ci/configure_debian12_makefiles_clang.cmake b/.gitlab/ci/configure_debian12_makefiles_clang.cmake index 9bd6275145..fa92973075 100644 --- a/.gitlab/ci/configure_debian12_makefiles_clang.cmake +++ b/.gitlab/ci/configure_debian12_makefiles_clang.cmake @@ -4,6 +4,7 @@ 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 "") + set(CMake_TEST_Emscripten_TOOLCHAINS "$ENV{CI_PROJECT_DIR}/.gitlab/emsdk/upstream/emscripten" CACHE PATH "") endif() include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_debian12_ninja_clang.cmake b/.gitlab/ci/configure_debian12_ninja_clang.cmake index 1a8e192da3..7f45fa9e62 100644 --- a/.gitlab/ci/configure_debian12_ninja_clang.cmake +++ b/.gitlab/ci/configure_debian12_ninja_clang.cmake @@ -1,6 +1,7 @@ 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 "") + set(CMake_TEST_Emscripten_TOOLCHAINS "$ENV{CI_PROJECT_DIR}/.gitlab/emsdk/upstream/emscripten" CACHE PATH "") endif() include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/env_debian12_makefiles_clang.sh b/.gitlab/ci/env_debian12_makefiles_clang.sh index e4ee2493e1..11f074510d 100644 --- a/.gitlab/ci/env_debian12_makefiles_clang.sh +++ b/.gitlab/ci/env_debian12_makefiles_clang.sh @@ -1,6 +1,7 @@ if test "$CMAKE_CI_NIGHTLY" = "true"; then source .gitlab/ci/iar-env.sh source .gitlab/ci/ticlang-env.sh + source .gitlab/ci/emsdk-env.sh fi export CC=/usr/bin/clang-15 diff --git a/.gitlab/ci/env_debian12_ninja_clang.sh b/.gitlab/ci/env_debian12_ninja_clang.sh index e4ee2493e1..11f074510d 100644 --- a/.gitlab/ci/env_debian12_ninja_clang.sh +++ b/.gitlab/ci/env_debian12_ninja_clang.sh @@ -1,6 +1,7 @@ if test "$CMAKE_CI_NIGHTLY" = "true"; then source .gitlab/ci/iar-env.sh source .gitlab/ci/ticlang-env.sh + source .gitlab/ci/emsdk-env.sh fi export CC=/usr/bin/clang-15