From 7b072b588c92b418c04419e34225da2015f1d684 Mon Sep 17 00:00:00 2001 From: Jenny Tam Date: Fri, 9 Oct 2020 17:29:59 -0700 Subject: [PATCH] Updated Azure Pipelines to call coveralls (#1201) --- .travis.yml | 5 ++--- azure-pipelines.yml | 26 +++++++++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6612431..5b4ba828 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,10 @@ env: - TEST_PHP_SQL_PWD=Password123 before_install: - - docker pull mcr.microsoft.com/mssql/server:2019-latest + - docker pull mcr.microsoft.com/mssql/server:2017-latest install: - - docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=Password123' -p 1433:1433 --name=$TEST_PHP_SQL_SERVER -d mcr.microsoft.com/mssql/server:2019-latest + - docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=Password123' -p 1433:1433 --name=$TEST_PHP_SQL_SERVER -d mcr.microsoft.com/mssql/server:2017-latest - docker build --build-arg PHPSQLDIR=$PHPSQLDIR -t msphpsql-dev -f Dockerfile-msphpsql . before_script: @@ -43,7 +43,6 @@ script: - docker exec client bash -c 'for f in ./test/functional/pdo_sqlsrv/*.out; do ls $f 2>/dev/null; cat $f 2>/dev/null; done || true' - docker exec client python ./test/functional/setup/cleanup_dbs.py -dbname $SQLSRV_DBNAME - docker exec client python ./test/functional/setup/cleanup_dbs.py -dbname $PDOSQLSRV_DBNAME - - docker exec client coveralls -i ./source/ -e ./source/shared/ -e ./test/ --gcov-options '\-lp' - docker stop client - docker ps -a diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9d169513..0096c28b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,7 @@ jobs: - job: Linux variables: - phpver: 7.3 + phpver: 7.4 pool: vmImage: 'ubuntu-18.04' steps: @@ -105,8 +105,14 @@ jobs: displayName: 'Install prerequisites' - script: | - docker pull mcr.microsoft.com/mssql/server:2017-latest - docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=$(pwd)' -p 1433:1433 -h $(host) --name=$(host) -d mcr.microsoft.com/mssql/server:2017-latest + python -m pip install --upgrade pip + python -m pip install --upgrade requests + python -m pip install cpp-coveralls + displayName: 'Install coveralls (upgrade both pip and requests first)' + + - script: | + docker pull mcr.microsoft.com/mssql/server:2019-latest + docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=$(pwd)' -p 1433:1433 -h $(host) --name=$(host) -d mcr.microsoft.com/mssql/server:2019-latest docker ps -a sleep 10 docker exec -t $(host) /opt/mssql-tools/bin/sqlcmd -S $(server) -U $(uid) -P $(pwd) -Q 'select @@Version' @@ -147,7 +153,7 @@ jobs: cd $(Build.SourcesDirectory)/source/sqlsrv ls -al - phpize && ./configure && make && sudo make install + phpize && ./configure LDFLAGS="-lgcov" CXXFLAGS="-O0 --coverage" && make && sudo make install cp run-tests.php $(Build.SourcesDirectory)/test/functional/sqlsrv echo extension=sqlsrv.so >> 20-sqlsrv.ini @@ -156,7 +162,7 @@ jobs: cd $(Build.SourcesDirectory)/source/pdo_sqlsrv ls -al - phpize && ./configure && make && sudo make install + phpize && ./configure LDFLAGS="-lgcov" CXXFLAGS="-O0 --coverage" && make && sudo make install cp run-tests.php $(Build.SourcesDirectory)/test/functional/pdo_sqlsrv echo extension=pdo_sqlsrv.so >> 30-pdo_sqlsrv.ini @@ -192,6 +198,16 @@ jobs: php run-tests.php -P ./*.phpt 2>&1 | tee ../pdo_sqlsrv.log displayName: 'Run pdo_sqlsrv functional tests' + - script: | + cd $(Build.SourcesDirectory) + coveralls -i ./source/ -e ./source/shared/ -e ./test/ -e ./source/pdo_sqlsrv/shared/core_stream.cpp \ + -e ./source/sqlsrv/shared/localization.hpp -e ./source/sqlsrv/shared/globalization.h \ + -e ./source/pdo_sqlsrv/shared/localization.hpp -e ./source/pdo_sqlsrv/shared/globalization.h \ + --gcov-options '\-lp' + displayName: 'Invoke coveralls using repo token' + env: + COVERALLS_REPO_TOKEN: $(repo_token) + - script: | cd $(Build.SourcesDirectory)/test/functional/ for f in sqlsrv/*.diff; do ls $f 2>/dev/null; cat $f 2>/dev/null; echo ''; done || true