making sure 'env' is present in the matrix
language: c
sudo: required
+matrix:
+ include:
+ - os: linux
+ compiler: gcc
+ dist: disco
+ env:
+ - DISTRO=disco
addons:
apt:
- config:
- retries: true
- sources: &common_sources
+ sources:
- ubuntu-toolchain-r-test
- packages: &common_packages
+ packages:
- gcc-8
- apache2
- apache2-dev
@@ -22,54 +27,14 @@ addons:
- libjansson-dev
- python3
-matrix:
- include:
- - os: linux
- compiler: gcc
- dist: disco
- addons:
- apt:
- sources:
- - *common_sources
- packages:
- - apache2
- - apache2-dev
- - apache2-ssl-dev
- - *common_packages
-
-# - os: linux
-# compiler: gcc
-# dist: xenial
-# addons:
-# apt:
-# sources:
-# - *common_sources
-# packages:
-# - *common_packages
-
-#jobs:
-# include:
-# - stage: compile
-# install: skip
-# before_script: ./buildconf
-# script: |
-# ./configure --with-apxs=/usr/bin/apxs &&
-# make clean && make && make install
-#
-#stages:
-# - compile
-
branches:
only:
- master
-#install: skip
-
before_script: ./buildconf
script: |
- dpkg --listfiles apache2 &&
- apxs &&
+ dpkg --listfiles apache2 && apxs &&
./configure && make clean && make && make install
#services:
