Skip to content

P
pistache
Unverified Commit 42f635a9 authored by Andrea Pappacoda's avatar Andrea Pappacoda
Browse files
Options

Travis cleanups: install libgtest-dev, remove … 

…unused apt sources
parent 5b8ec5d5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 34 deletions
.travis.yml
View file @ 42f635a9
...@@ -37,9 +37,7 @@ _apt_pkgs: &_apt_pkgs ...@@ -37,9 +37,7 @@ _apt_pkgs: &_apt_pkgs
- 'ninja-build' - 'ninja-build'
- 'libblocksruntime-dev' - 'libblocksruntime-dev'
- 'rapidjson-dev' - 'rapidjson-dev'
- 'libgtest-dev'
_apt_srcs: &_apt_srcs
- 'ubuntu-toolchain-r-test'
_env_clang_6: &_env_clang_6 _env_clang_6: &_env_clang_6
- CC=clang-6.0 - CC=clang-6.0
...@@ -102,9 +100,6 @@ jobs: ...@@ -102,9 +100,6 @@ jobs:
env: *_env_clang_6 env: *_env_clang_6
addons: addons:
apt: apt:
sources:
- *_apt_srcs
- ['llvm-toolchain-6.0']
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['clang-6.0', 'llvm-6.0-tools', 'libstdc++-7-dev'] - ['clang-6.0', 'llvm-6.0-tools', 'libstdc++-7-dev']
...@@ -113,9 +108,6 @@ jobs: ...@@ -113,9 +108,6 @@ jobs:
env: *_env_clang_7 env: *_env_clang_7
addons: addons:
apt: apt:
sources:
- *_apt_srcs
- ['llvm-toolchain-7']
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['clang-7', 'llvm-7-tools', 'libstdc++-7-dev'] - ['clang-7', 'llvm-7-tools', 'libstdc++-7-dev']
...@@ -124,9 +116,6 @@ jobs: ...@@ -124,9 +116,6 @@ jobs:
env: *_env_clang_8 env: *_env_clang_8
addons: addons:
apt: apt:
sources:
- *_apt_srcs
- ['llvm-toolchain-8']
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['clang-8', 'llvm-8-tools', 'libstdc++-8-dev'] - ['clang-8', 'llvm-8-tools', 'libstdc++-8-dev']
...@@ -135,9 +124,6 @@ jobs: ...@@ -135,9 +124,6 @@ jobs:
env: *_env_clang_9 env: *_env_clang_9
addons: addons:
apt: apt:
sources:
- *_apt_srcs
- ['llvm-toolchain-9']
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['clang-9', 'llvm-9-tools', 'libstdc++-9-dev'] - ['clang-9', 'llvm-9-tools', 'libstdc++-9-dev']
...@@ -146,9 +132,6 @@ jobs: ...@@ -146,9 +132,6 @@ jobs:
env: *_env_clang_10 env: *_env_clang_10
addons: addons:
apt: apt:
sources:
- *_apt_srcs
- ['llvm-toolchain-10']
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['clang-10', 'llvm-10-tools', 'libstdc++-10-dev'] - ['clang-10', 'llvm-10-tools', 'libstdc++-10-dev']
...@@ -158,8 +141,6 @@ jobs: ...@@ -158,8 +141,6 @@ jobs:
env: *_env_gcc_7 env: *_env_gcc_7
addons: addons:
apt: apt:
sources:
- *_apt_srcs
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['g++-7'] - ['g++-7']
...@@ -168,8 +149,6 @@ jobs: ...@@ -168,8 +149,6 @@ jobs:
env: *_env_gcc_8 env: *_env_gcc_8
addons: addons:
apt: apt:
sources:
- *_apt_srcs
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['g++-8'] - ['g++-8']
...@@ -178,8 +157,6 @@ jobs: ...@@ -178,8 +157,6 @@ jobs:
env: *_env_gcc_9 env: *_env_gcc_9
addons: addons:
apt: apt:
sources:
- *_apt_srcs
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['g++-9'] - ['g++-9']
...@@ -188,8 +165,6 @@ jobs: ...@@ -188,8 +165,6 @@ jobs:
env: *_env_gcc_10 env: *_env_gcc_10
addons: addons:
apt: apt:
sources:
- *_apt_srcs
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['g++-10'] - ['g++-10']
...@@ -198,8 +173,6 @@ jobs: ...@@ -198,8 +173,6 @@ jobs:
env: *_env_gcc_8 env: *_env_gcc_8
addons: addons:
apt: apt:
sources:
- *_apt_srcs
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['g++-8'] - ['g++-8']
...@@ -208,8 +181,6 @@ jobs: ...@@ -208,8 +181,6 @@ jobs:
env: *_env_gcc_8 env: *_env_gcc_8
addons: addons:
apt: apt:
sources:
- *_apt_srcs
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['g++-8'] - ['g++-8']
...@@ -218,8 +189,6 @@ jobs: ...@@ -218,8 +189,6 @@ jobs:
env: *_env_gcc_8 env: *_env_gcc_8
addons: addons:
apt: apt:
sources:
- *_apt_srcs
packages: packages:
- *_apt_pkgs - *_apt_pkgs
- ['g++-8'] - ['g++-8']
...@@ -233,7 +202,7 @@ before_install: ...@@ -233,7 +202,7 @@ before_install:
install: install:
- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
- mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR} - mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
# Install Meson >=0.57.0 # Install latest Meson version
- sudo pip3 install -qqq --ignore-installed meson - sudo pip3 install -qqq --ignore-installed meson
before_script: before_script:
...@@ -250,7 +219,7 @@ before_script: ...@@ -250,7 +219,7 @@ before_script:
# Print debug system information # Print debug system information
- cat /proc/sys/kernel/core_pattern - cat /proc/sys/kernel/core_pattern
- cat /etc/default/apport || true - cat /etc/default/apport || true
- systemctl list-units --type=service --state=running || true - systemctl list-units --type=service --state=running --no-pager || true
# Meson debug build # Meson debug build
- meson setup meson_build_debug - meson setup meson_build_debug
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment