diff --git a/.gitignore b/.gitignore index 4e08c7a..cb06cfc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +build + .idea */*.png diff --git a/.travis.yml b/.travis.yml index 6565cc9..7505b71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,16 +8,18 @@ language: cpp before_install: - docker pull ubuntu:xenial - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name ubuntu-build ubuntu:xenial + - docker pull base/archlinux + - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name arch-build base/archlinux script: - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH" - - docker exec ubuntu-build apt-get update -y - - docker exec ubuntu-build apt-get install software-properties-common -y - - docker exec ubuntu-build add-apt-repository -s ppa:kernsuite/kern-3 -y - - docker exec ubuntu-build apt-add-repository multiverse - - docker exec ubuntu-build apt-get update -y - - docker exec ubuntu-build apt-get install -y git cmake g++ pkg-config libcfitsio-bin libcfitsio-dev libopenblas-base libopenblas-dev wcslib-dev wcslib-tools libglib2.0-dev libcasa-casa2 casacore-dev casacore-data casacore-tools - - | - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/test-builds/test-ubuntu.sh" + #- docker exec ubuntu-build apt-get update -y + #- docker exec ubuntu-build apt-get install software-properties-common -y + #- docker exec ubuntu-build add-apt-repository -s ppa:kernsuite/kern-3 -y + #- docker exec ubuntu-build apt-add-repository multiverse + #- docker exec ubuntu-build apt-get update -y + #- docker exec ubuntu-build apt-get install -y git cmake g++ pkg-config libcfitsio-bin libcfitsio-dev libopenblas-base libopenblas-dev wcslib-dev wcslib-tools libglib2.0-dev libcasa-casa2 casacore-dev casacore-data casacore-tools + - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/prepare-ubuntu.sh" + - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/compile-ubuntu.sh" diff --git a/test-builds/test-ubuntu.sh b/build-tests/ubuntu/compile-ubuntu.sh similarity index 100% rename from test-builds/test-ubuntu.sh rename to build-tests/ubuntu/compile-ubuntu.sh diff --git a/build-tests/ubuntu/prepare-ubuntu.sh b/build-tests/ubuntu/prepare-ubuntu.sh new file mode 100755 index 0000000..79cf219 --- /dev/null +++ b/build-tests/ubuntu/prepare-ubuntu.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +apt-get update -y +apt-get install software-properties-common -y +add-apt-repository -s ppa:kernsuite/kern-3 -y +apt-add-repository multiverse +apt-get update -y +apt-get install -y git cmake g++ pkg-config libcfitsio-bin libcfitsio-dev libopenblas-base libopenblas-dev wcslib-dev wcslib-tools libglib2.0-dev libcasa-casa2 casacore-dev casacore-data casacore-tools +