diff --git a/.travis.yml b/.travis.yml index f3292aa..010ac22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,13 @@ sudo: required -arch: - packages: - - plasma-framework - # build deps - - cmake - - extra-cmake-modules - - python - # test - - xorg-server-xvfb - # additional targets - - clang - - cppcheck - script: - - export DISPLAY=:99.0 - - git clone https://github.com/arcan1s/awesome-widgets/ - - cd awesome-widgets; git submodule update --init --recursive - - mkdir awesome-widgets/build - - cd awesome-widgets/build; cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Optimization -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_FUTURE=ON -DBUILD_TESTING=ON ../sources - - cd awesome-widgets/build; make - - cd awesome-widgets/build; make cppcheck - - cd awesome-widgets/build; make clangformat && ( [ `git status -s | wc -l` -eq 0 ] || exit 1 ) - - cd awesome-widgets/build; xvfb-run make test - - sleep 3 +env: + - DOCKER_TAG="arcan1s/awesome-widgets-arch" -script: - - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" +services: + - docker + +before_install: + - docker build --tag="${DOCKER_TAG}" -f ".docker/Dockerfile-arch" ".docker" + +scirpt: + - docker run --rm -v "$(pwd):/opt/build" -w /opt/build "${DOCKER_TAG}" ".docker/build-arch.sh" diff --git a/.travis.yml.bckp b/.travis.yml.bckp deleted file mode 100644 index dad2148..0000000 --- a/.travis.yml.bckp +++ /dev/null @@ -1,13 +0,0 @@ -sudo: required - -env: - - DOCKER_TAG="arcan1s/awesome-widgets" - -services: - - docker - -before_install: - - docker build --tag="${DOCKER_TAG}" .docker - -scirpt: - - docker run "${DOCKER_TAG}" .docker/build.sh