Skip to content

Commit b8037cf

Browse files
author
Sergey Shinderuk
committed
Build and test on Travis without Docker
Install postgresql packages from the PGDG apt repo.
1 parent bf6bc4b commit b8037cf

6 files changed

+42
-136
lines changed

.gitignore

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
.deps
21
*.o
32
*.so
4-
/results
5-
.log
6-
Dockerfile
3+
/.deps/
74
/log/
5+
/results/
6+
/tmp_check/

.travis.yml

+17-29
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,20 @@
1-
os:
2-
- linux
3-
4-
sudo: required
51
dist: jammy
6-
72
language: c
8-
9-
services:
10-
- docker
11-
12-
install:
13-
- sed -e 's/${CHECK_CODE}/'${CHECK_CODE}/g -e 's/${PG_VERSION}/'${PG_VERSION}/g Dockerfile.tmpl > Dockerfile
14-
- docker-compose build
15-
16-
script:
17-
- docker-compose run tests
18-
193
env:
20-
- PG_VERSION=11 CHECK_CODE=clang
21-
- PG_VERSION=11 CHECK_CODE=cppcheck
22-
- PG_VERSION=11 CHECK_CODE=false
23-
- PG_VERSION=12 CHECK_CODE=clang
24-
- PG_VERSION=12 CHECK_CODE=false
25-
- PG_VERSION=13 CHECK_CODE=clang
26-
- PG_VERSION=13 CHECK_CODE=false
27-
- PG_VERSION=14 CHECK_CODE=clang
28-
- PG_VERSION=14 CHECK_CODE=false
29-
- PG_VERSION=15 CHECK_CODE=clang
30-
- PG_VERSION=15 CHECK_CODE=false
31-
- PG_VERSION=16 CHECK_CODE=clang
32-
- PG_VERSION=16 CHECK_CODE=false
4+
- PG_MAJOR=16
5+
- PG_MAJOR=15
6+
- PG_MAJOR=14
7+
- PG_MAJOR=13
8+
- PG_MAJOR=12
9+
- PG_MAJOR=11
10+
before_script:
11+
- curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
12+
- echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" | sudo tee -a /etc/apt/sources.list
13+
- sudo apt-get update
14+
- sudo systemctl stop postgresql
15+
- sudo apt-get install -y --no-install-recommends postgresql-${PG_MAJOR} postgresql-server-dev-${PG_MAJOR}
16+
- sudo systemctl stop postgresql
17+
script: ./run-tests.sh
18+
after_script:
19+
- cat regression.diffs
20+
- cat logfile

Dockerfile.tmpl

-34
This file was deleted.

docker-compose.yml

-2
This file was deleted.

run-tests.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
set -ev
3+
4+
PATH=/usr/lib/postgresql/$PG_MAJOR/bin:$PATH
5+
export PGDATA=/var/lib/postgresql/$PG_MAJOR/test
6+
export COPT=-Werror
7+
export USE_PGXS=1
8+
9+
sudo chmod 1777 /var/lib/postgresql/$PG_MAJOR
10+
sudo chmod 1777 /var/run/postgresql
11+
12+
make clean
13+
make
14+
15+
sudo -E env PATH=$PATH make install
16+
17+
initdb
18+
echo "shared_preload_libraries = pg_wait_sampling" >> $PGDATA/postgresql.conf
19+
20+
pg_ctl -l logfile start
21+
make installcheck
22+
pg_ctl stop

run_tests.sh

-67
This file was deleted.

0 commit comments

Comments
 (0)