Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade dependency to PG11 and fix CI

This commit is contained in:
Andrey Borodin 2020-02-26 17:24:13 +05:00
parent c0d972e779
commit 5f7e3ea546
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -1,8 +1,8 @@
dist: bionic dist: bionic
language: c language: c
before_install: before_install:
- sudo apt-get -y --no-install-recommends install postgresql-10 postgresql-server-dev-10 - sudo apt-get -y --no-install-recommends install postgresql-11 postgresql-server-dev-11
- sudo pkill -9 postgres - sudo pkill -9 postgres || true
- echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
compiler: compiler:

4
CMakeLists.txt
View File

@ -19,9 +19,9 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
set(CMAKE_BUILD_TYPE "Debug") set(CMAKE_BUILD_TYPE "Debug")
endif() endif()
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
set(CMAKE_C_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -Wstrict-aliasing -g -O2") set(CMAKE_C_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -Wstrict-aliasing -g -O2 -pthread")
elseif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") elseif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(CMAKE_C_FLAGS "-std=gnu99 -fsanitize=address -pedantic -Wall -Wextra -Wstrict-aliasing -g -O0") set(CMAKE_C_FLAGS "-std=gnu99 -fsanitize=address -pedantic -Wall -Wextra -Wstrict-aliasing -g -O0 -pthread")
endif() endif()
string(TOLOWER ${CMAKE_BUILD_TYPE} OD_VERSION_BUILD) string(TOLOWER ${CMAKE_BUILD_TYPE} OD_VERSION_BUILD)

6
cmake/FindPostgreSQL.cmake
View File

@ -11,7 +11,7 @@ find_path(
PATH_SUFFIXES PG_INCLUDE_SERVER PATH_SUFFIXES PG_INCLUDE_SERVER
) )
option(PG_VERSION_NUM "PostgreSQL version" 100000) option(PG_VERSION_NUM "PostgreSQL version" 110000)
execute_process ( execute_process (
COMMAND pg_config --libdir COMMAND pg_config --libdir
@ -35,13 +35,13 @@ set(POSTGRESQL_INCLUDE_DIR ${PG_INCLUDE_SERVER})
find_library( find_library(
POSTGRESQL_LIBRARY POSTGRESQL_LIBRARY
NAMES pgcommon NAMES pgcommon
HINTS ${PG_LIBDIR} ${PG_PKGLIBDIR} HINTS ${PG_PKGLIBDIR} ${PG_LIBDIR}
) )
find_library( find_library(
POSTGRESQL_LIBPGPORT POSTGRESQL_LIBPGPORT
NAMES pgport NAMES pgport
HINTS ${PG_LIBDIR} ${PG_PKGLIBDIR} HINTS ${PG_PKGLIBDIR} ${PG_LIBDIR}
) )
find_library( find_library(

2
docker/Dockerfile
View File

@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
gdb \ gdb \
libpam0g-dev \ libpam0g-dev \
libssl-dev \ libssl-dev \
postgresql-server-dev-10 \ postgresql-server-dev-11 \
valgrind valgrind
COPY entrypoint.sh /usr/local/bin/entrypoint.sh COPY entrypoint.sh /usr/local/bin/entrypoint.sh

2
scripts/debian/control
View File

@ -3,7 +3,7 @@ Section: database
Priority: extra Priority: extra
Maintainer: mdb <mdb-admin@yandex-team.ru> Maintainer: mdb <mdb-admin@yandex-team.ru>
Standards-Version: 3.9.4 Standards-Version: 3.9.4
Build-Depends: debhelper (>= 9), make, cmake, libssl-dev (>= 1.0.1), libpam-dev, postgresql-server-dev-10 Build-Depends: debhelper (>= 9), make, cmake, libssl-dev (>= 1.0.1), libpam-dev, postgresql-server-dev-11
Homepage: https://github.com/yandex/odyssey Homepage: https://github.com/yandex/odyssey
Package: @NAME@ Package: @NAME@