Skip to content

Travis with arm64 #1850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddpbsd merged 3 commits into from
Mar 5, 2020
Merged

Travis with arm64 #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30548dd
Add arm64 to test on travis
nurse Mar 2, 2020
d626b82
more loose matching for arm64
nurse Mar 3, 2020
9dc2a73
Use latest valgrind on arm64
nurse Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,19 @@ compiler:
- clang


arch:
- amd64
- arm64

matrix:
fast_finish: true
exclude:
- arch: arm64
env: DB=none OSSEC_TYPE=winagent GEOIP=no PCRE2_SYSTEM=no
- compiler: clang
env: DB=none OSSEC_TYPE=winagent GEOIP=no
env: DB=none OSSEC_TYPE=winagent GEOIP=no PCRE2_SYSTEM=no
- compiler: clang
env: OSSEC_TYPE=server RULES=test

env: OSSEC_TYPE=server RULES=test PCRE2_SYSTEM=no


before_script:
Expand All @@ -49,7 +54,7 @@ before_script:
- if [[ "${ZEROMQ}" == "yes" ]]; then ( sudo apt-get install libzmq3-dev libtool autoconf libczmq-dev ); fi
- if [[ "${OSSEC_TYPE}" == "winagent" ]]; then ( sudo apt-get install aptitude && sudo aptitude -y install mingw-w64 nsis ); fi
- if [[ "${OSSEC_TYPE}" == "server" ]]; then ( sudo apt-get install libsqlite3-dev sqlite3 ); fi
- if [[ "${OSSEC_TYPE}" == "test" ]]; then ( sudo apt-get update && sudo apt-get install check valgrind ); fi
- if [[ "${OSSEC_TYPE}" == "test" ]]; then if [ `uname -m` = "aarch64" ]; then (sudo apt-get install check libc6-dbg && wget -q http://ports.ubuntu.com/pool/main/v/valgrind/valgrind_3.15.0-1ubuntu3.1_arm64.deb && sudo dpkg -i valgrind_3.15.0-1ubuntu3.1_arm64.deb ) ; else ( sudo apt-get install check valgrind ); fi; fi


script:
Expand Down
2 changes: 0 additions & 2 deletions src/tests/valgrind.supp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
Memcheck:Leak
fun:malloc
fun:strdup
fun:xstrdup
obj:/usr/bin/make
fun:main
}
{
os_net_unit_test_forced_error
Expand Down