Skip to content
This repository was archived by the owner on Oct 23, 2023. It is now read-only.

Commit 801710e

Browse files
committed
Compile before linting and trying not to use brew
1 parent 125321e commit 801710e

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

.travis.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,31 @@ services:
66
matrix:
77
include:
88
- env:
9+
- WHAT=test
910
- TOOLCHAIN=ubuntu16.04
1011
- RELEASE_FILE=task-maker-${TRAVIS_TAG}_ubuntu16.04_amd64.deb
1112
- env:
13+
- WHAT=test
1214
- TOOLCHAIN=ubuntu18.04
1315
- RELEASE_FILE=task-maker-${TRAVIS_TAG}_ubuntu18.04_amd64.deb
1416
- env:
17+
- WHAT=test
1518
- TOOLCHAIN=archlinux
1619
- RELEASE_FILE=task-maker-${TRAVIS_TAG}_archlinux_amd64.tar.xz
1720
- env:
21+
- WHAT=test
1822
- TOOLCHAIN=archlinux-clang
1923
- ADDRESSSANITIZER=ON
2024
deploy: []
2125
- env:
26+
- WHAT=test-AUR-package
2227
- TOOLCHAIN=archlinux
2328
script:
2429
- tools/check_docker.sh
2530
- docker run --rm edomora97/task-maker-builder-archlinux:latest yay -Syu --noconfirm task-maker-git
2631
deploy: []
2732
- env:
33+
- WHAT=clang-tidy
2834
- TOOLCHAIN=archlinux-clang
2935
script:
3036
- tools/check_docker.sh
@@ -38,14 +44,21 @@ matrix:
3844
-v $(pwd):/build
3945
--cap-add SYS_PTRACE
4046
edomora97/task-maker-builder-$TOOLCHAIN:latest
41-
hooks/lint-all
47+
/build/tools/compile_and_lint.sh
4248
deploy: []
4349
- os: osx
4450
env:
51+
- WHAT=test
4552
- TOOLCHAIN=osx
53+
addons:
54+
homebrew:
55+
packages:
56+
- python
57+
- wget
58+
- cmake
59+
- rust
60+
- fpc
4661
install:
47-
- brew upgrade python wget cmake
48-
- brew install rust
4962
- python3 -m venv /tmp/venv --without-pip
5063
- source /tmp/venv/bin/activate
5164
- wget -O- https://bootstrap.pypa.io/get-pip.py | python3

tools/compile_and_lint.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
python3 -m venv /tmp/venv --system-site-packages
6+
. /tmp/venv/bin/activate
7+
cmake -H. -Bbuild -DHUNTER_ENABLED=OFF -DTRAVIS=ON
8+
cmake --build build
9+
./hooks/lint-all

0 commit comments

Comments
 (0)