Skip to content

Commit

Permalink
Transition old compiler tests from travis to CirrusCI
Browse files Browse the repository at this point in the history
  • Loading branch information
milot-mirdita committed Jul 15, 2021
1 parent 442d898 commit 904d0c6
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 135 deletions.
34 changes: 29 additions & 5 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,36 @@
freebsd_instance:
image_family: freebsd-13-0
env:
CIRRUS_CLONE_SUBMODULES: true

task:
env:
CIRRUS_CLONE_SUBMODULES: true
name: FreeBSD-13
freebsd_instance:
image_family: freebsd-13-0
install_script: pkg install -y cmake git samtools
compile_script: |
mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Release -DHAVE_TESTS=1 -DENABLE_WERROR=1 -DHAVE_SSE4_1=1 ..
make -j $(sysctl -n hw.ncpu)
test_script: ./util/regression/run_regression.sh ./build/src/mmseqs SCRATCH
test_script: ./util/regression/run_regression.sh ./build/src/mmseqs SCRATCH

task:
name: "Old compilers"
container:
image: debian:jessie-slim
memory: 8G
matrix:
- name: Clang-4
install_script: apt update --yes && apt install cmake clang-4.0 libc++-dev make git ca-certificates --yes --no-install-suggests --no-install-recommends
env:
CC: clang-4.0
CXX: clang++-4.0
- name: GCC-4.9
install_script: apt update --yes && apt install cmake gcc-4.9 g++-4.9 make git ca-certificates --yes --no-install-suggests --no-install-recommends
env:
CC: gcc-4.9
CXX: g++-4.9
compile_script: |
mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Release -DHAVE_TESTS=1 -DENABLE_WERROR=1 -DHAVE_SSE4_1=1 -DREQUIRE_OPENMP=0 ..
make -j $(nproc --all)
test_script: ./util/regression/run_regression.sh ./build/src/mmseqs SCRATCH SEARCH

130 changes: 0 additions & 130 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions src/commons/FastSort.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <algorithm>
#ifdef ENABLE_IPS4O
# include "simde/hedley.h"
# if defined(HEDLEY_GCC_VERSION) && HEDLEY_GCC_VERSION_CHECK(0,0,0) && !HEDLEY_GCC_VERSION_CHECK(5,1,0) && defined(__cplusplus)
Expand Down
4 changes: 4 additions & 0 deletions src/util/tar2db.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,19 @@ int tar2db(int argc, const char **argv, const Command& command) {
EXIT(EXIT_FAILURE);
}

#ifdef OPENMP
int localThreads = par.threads;
#endif
mtar_t tar;
if (Util::endsWith(".tar.gz", filenames[i]) || Util::endsWith(".tgz", filenames[i])) {
#ifdef HAVE_ZLIB
if (mtar_gzopen(&tar, filenames[i].c_str()) != MTAR_ESUCCESS) {
Debug(Debug::ERROR) << "Cannot open file " << filenames[i] << "\n";
EXIT(EXIT_FAILURE);
}
#ifdef OPENMP
localThreads = 1;
#endif
#else
Debug(Debug::ERROR) << "MMseqs2 was not compiled with zlib support. Cannot read compressed input.\n";
EXIT(EXIT_FAILURE);
Expand Down

0 comments on commit 904d0c6

Please sign in to comment.