diff options
-rw-r--r-- | .github/workflows/pr-ci.yml | 6 | ||||
-rw-r--r-- | .travis.yml | 25 | ||||
-rwxr-xr-x | test/ci-build.sh (renamed from test/travis-build.sh) | 6 | ||||
-rwxr-xr-x | test/ci-install.sh (renamed from test/travis-install.sh) | 0 |
4 files changed, 8 insertions, 29 deletions
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index e1007f8..401b768 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -1,4 +1,4 @@ -name: Converted Workflow +name: 'Build & Test' on: push: branches: @@ -21,6 +21,6 @@ jobs: if: runner.os == 'Linux' run: sudo apt-get update && sudo apt-get install -y clang doxygen gcc gcc-10 gcc-9 libstdc++-10-dev libstdc++-9-dev ninja-build python3-pip python3-setuptools valgrind - uses: actions/checkout@v3 - - run: test/travis-install.sh - - run: test/travis-build.sh + - run: test/ci-install.sh + - run: test/ci-build.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0b5749c..0000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -sudo: required -dist: jammy - -language: - - c - - c++ -addons: - apt: - sources: - - sourceline: 'ppa:ubuntu-toolchain-r/test' - packages: - - doxygen - - clang - - libstdc++-9-dev - - libstdc++-10-dev - - gcc - - gcc-9 - - gcc-10 - - python3-pip - - python3-setuptools - - ninja-build - - valgrind -install: test/travis-install.sh -script: test/travis-build.sh - diff --git a/test/travis-build.sh b/test/ci-build.sh index f3a106a..71508d9 100755 --- a/test/travis-build.sh +++ b/test/ci-build.sh @@ -29,6 +29,9 @@ for CC in gcc gcc-9 gcc-10 clang; do mkdir build-${CC}; cd build-${CC} if [ "${CC}" == "clang" ]; then export CXX="clang++" + export TEST_WITH_VALGRIND=false + else + export TEST_WITH_VALGRIND=true fi if [ ${CC} == 'gcc-7' ]; then build_opts='-D b_lundef=false' @@ -45,7 +48,7 @@ for CC in gcc gcc-9 gcc-10 clang; do sudo chown root:root util/fusermount3 sudo chmod 4755 util/fusermount3 - TEST_WITH_VALGRIND=true ${TEST_CMD} + ${TEST_CMD} cd .. done (cd build-$CC; sudo ninja install) @@ -83,6 +86,7 @@ sanitized_build() # Sanitized build CC=clang CXX=clang++ +TEST_WITH_VALGRIND=false for san in undefined address; do sanitized_build ${san} done diff --git a/test/travis-install.sh b/test/ci-install.sh index 924623b..924623b 100755 --- a/test/travis-install.sh +++ b/test/ci-install.sh |