diff options
| author | yangwei <[email protected]> | 2023-11-10 16:50:56 +0800 |
|---|---|---|
| committer | yangwei <[email protected]> | 2023-11-10 16:50:56 +0800 |
| commit | f3b271b613cb0a733996fc2f57439cd36763381e (patch) | |
| tree | 52dcbea79e207345c602acb24697bc850a67ef4d | |
| parent | c531caa1cf56605242da3365fef07935c64bf2b7 (diff) | |
🐞 fix(travis.sh): remove devtoolset-7
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ci/travis.sh | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c55cb1..c30d2d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ variables: stages: - cppcheck - build -#- test +- test - upload .everything_before_script: &everything_before_script @@ -163,7 +163,19 @@ release_build_for_centos8: ############################################################################### # test ############################################################################### - +.setup_test_env_for_centos8: + stage: test + image: $BUILD_IMAGE_CENTOS8 + allow_failure: false + before_script: + - *everything_before_script + - ls -l /opt/MESA/lib && echo "/opt/MESA/lib" >> /etc/ld.so.conf + - cd build; make test + dependencies: + - develop_build_for_centos8 + - release_build_for_centos8 + tags: + - share ############################################################################### # upload diff --git a/CMakeLists.txt b/CMakeLists.txt index 01b1a18..e05d480 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,8 +85,8 @@ add_subdirectory(src/stellar_on_sapp) add_subdirectory(examples/sapp_plugin) add_subdirectory(examples/stellar_plugin) -#enable_testing() -#add_subdirectory(test) +enable_testing() +add_subdirectory(test) install(FILES include/stellar/session_exdata.h DESTINATION ${CMAKE_INSTALL_PREFIX}/framework/include/stellar COMPONENT HEADER) diff --git a/ci/travis.sh b/ci/travis.sh index a398d5d..a5d12f6 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -32,10 +32,6 @@ env | sort : "${NO_RTTI:=OFF}" : "${COMPILER_IS_GNUCXX:=OFF}" -if [ $ASAN_OPTION ]; then - source /opt/rh/devtoolset-7/enable -fi - mkdir build || true cd build |