diff --git a/ci/ci-install.bash b/ci/ci-install.bash index 723dcb586..0b1439f8f 100755 --- a/ci/ci-install.bash +++ b/ci/ci-install.bash @@ -60,11 +60,11 @@ if [ "$CI_BUILD_STAGE_NAME" = "build" ]; then sudo apt-get install libgoogle-perftools-dev || sudo apt-get install libgoogle-perftools-dev fi - if [ "$CI_RUNS_ON" = "ubuntu-20.04" ] || [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then + if [ "$CI_RUNS_ON" = "ubuntu-20.04" ] || [ "$CI_RUNS_ON" = "ubuntu-22.04" ] || [ "$CI_RUNS_ON" = "ubuntu-24.04" ]; then sudo apt-get install libsystemc libsystemc-dev || sudo apt-get install libsystemc libsystemc-dev fi - if [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then + if [ "$CI_RUNS_ON" = "ubuntu-22.04" ] || [ "$CI_RUNS_ON" = "ubuntu-24.04" ]; then sudo apt-get install bear mold || sudo apt-get install bear mold fi @@ -95,11 +95,11 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then sudo apt-get install gdb gtkwave lcov libfl-dev ccache jq z3 || sudo apt-get install gdb gtkwave lcov libfl-dev ccache jq z3 # Required for test_regress/t/t_dist_attributes.pl - if [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then + if [ "$CI_RUNS_ON" = "ubuntu-22.04" ] || [ "$CI_RUNS_ON" = "ubuntu-24.04" ]; then sudo apt-get install python3-clang mold || sudo apt-get install python3-clang mold fi - if [ "$CI_RUNS_ON" = "ubuntu-20.04" ] || [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then + if [ "$CI_RUNS_ON" = "ubuntu-20.04" ] || [ "$CI_RUNS_ON" = "ubuntu-22.04" ] || [ "$CI_RUNS_ON" = "ubuntu-24.04" ]; then sudo apt-get install libsystemc-dev || sudo apt-get install libsystemc-dev fi diff --git a/ci/ci-script.bash b/ci/ci-script.bash index bee825161..eabffb991 100755 --- a/ci/ci-script.bash +++ b/ci/ci-script.bash @@ -85,7 +85,7 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then fi # Run sanitize on Ubuntu 22.04 only - [ "$CI_RUNS_ON" = 'ubuntu-22.04' ] && sanitize='--sanitize' || sanitize='' + ( [ "$CI_RUNS_ON" = 'ubuntu-22.04' ] || [ "$CI_RUNS_ON" = 'ubuntu-24.04' ] ) && sanitize='--sanitize' || sanitize='' TEST_REGRESS=test_regress if [ "$CI_RELOC" == 1 ]; then