Skip to content

Commit

Permalink
Merge pull request MobilityDB#360 from MobilityDB/develop
Browse files Browse the repository at this point in the history
Merging develop into master in preparation of MobilityDB 1.1 release
  • Loading branch information
mschoema authored Jul 28, 2023
2 parents ed738c1 + ba95f0d commit ae74a3f
Show file tree
Hide file tree
Showing 1,198 changed files with 611,220 additions and 347,152 deletions.
3 changes: 3 additions & 0 deletions .codacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ engines:
language: c
exclude_paths:
- "postgis/**"
- "postgres/**"
duplication:
exclude_paths:
- "postgis/**"
- "postgres/**"
config:
languages:
- "c"
exclude_paths:
- "postgis/**"
- "postgres/**"
13 changes: 1 addition & 12 deletions .github/workflows/check-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install Requirements
run: |
sudo apt install -y licensecheck
- name: Run License Check
run: ./tools/scripts/test_license.sh

shell_check:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install Requirements
run: |
sudo apt install -y shellcheck
- name: Run Shell Check
run: ./tools/scripts/test_shell.sh
5 changes: 2 additions & 3 deletions .github/workflows/clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Get postgres version
run: |
Expand All @@ -51,7 +51,6 @@ jobs:
sudo apt-get update
sudo apt-get install -y \
clang \
liblwgeom-dev \
libgeos++-dev \
libproj-dev \
libjson-c-dev \
Expand All @@ -66,7 +65,7 @@ jobs:
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
mkdir build
cd build
CC=clang cmake -DCMAKE_BUILD_TYPE=Debug ..
CC=clang cmake -DCMAKE_BUILD_TYPE=Release ..
- name: Build
run: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: install deps
run: |
Expand All @@ -27,7 +27,7 @@ jobs:
run: |
mkdir build
cd build
cmake ..
cmake -DCMAKE_BUILD_TYPE=Release ..
- name: Build
run: |
Expand All @@ -37,6 +37,8 @@ jobs:
- name: test install
run: |
mkdir /usr/local/var/postgres
initdb -D /usr/local/var/postgres
pg_ctl -D /usr/local/var/postgres start
createdb ___mobdb___test___
psql -d ___mobdb___test___ -c "CREATE EXTENSION mobilitydb CASCADE; SELECT mobilitydb_version();"
Expand Down
37 changes: 10 additions & 27 deletions .github/workflows/pgversion.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
name: Main Build

# 4 * 1 * 2 + 1 (coverage) = 9 jobs are triggered
# Test for supported postgres version
# - except: MobilityDB does not support 9.6
# Test for supported PosgreSQL/PostGIS versions
# 3 (PosgreSQL) * 1 (PostGIS) * 2 (Linux) + 1 (coverage) = 7 jobs are triggered
# Allow manual trigger

on:
Expand All @@ -20,26 +19,18 @@ jobs:
strategy:
fail-fast: false
matrix:
psql: [11,12,13]
postgis: [2.5]
os: [ubuntu-latest, ubuntu-18.04]
psql: [12,13,14,15]
postgis: [3]
os: [ubuntu-latest]
coverage: [0]
include:
- psql: 12
postgis: 3
os: ubuntu-latest
coverage: 0
- psql: 13
postgis: 3
os: ubuntu-latest
coverage: 0
- psql: 14
- psql: 15
postgis: 3
os: ubuntu-latest
coverage: 1

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: get postgres version
run: |
Expand Down Expand Up @@ -71,11 +62,6 @@ jobs:
ls /usr/lib/postgresql/${{ matrix.psql }}/lib/
xzcat --version
- name: Install liblwgeom for PostGIS 2.5
if: matrix.postgis == '2.5'
run: |
sudo apt-get -y install liblwgeom-dev
- name: Install coverall dependencies
if: matrix.coverage == '1'
run: |
Expand All @@ -86,7 +72,7 @@ jobs:
export PATH=/usr/lib/postgresql/${{ matrix.psql }}/bin:$PATH
mkdir build
cd build
cmake -DWITH_COVERAGE=${{ matrix.coverage }} ..
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_COVERAGE=${{ matrix.coverage }} ..
- name: Build
run: |
Expand All @@ -109,11 +95,8 @@ jobs:
if: matrix.coverage == '1'
run: |
cd build
# Previous coverage before embeding liblwgeom
# lcov --capture --directory . --output-file=lcov.info
# Selecting the coverage information from only the /src directory
lcov --capture --directory . --output-file=lcov_temp.info
lcov --extract lcov_temp.info */MobilityDB/src/* --output-file=lcov.info
# Excluding MEOS-specific and other miscellaneous files
lcov --capture --directory . --exclude *_meos.c --exclude */geo_constructors.c --exclude */tpoint_datagen.c --include */MobilityDB/meos/src/* --include */MobilityDB/mobilitydb/src/* --output-file=lcov.info
- name: Coveralls
if: matrix.coverage == '1'
Expand Down
67 changes: 67 additions & 0 deletions .github/workflows/windows_msys2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Build for Windows

on:
push:
# branches: [ main ]
pull_request:
# branches: [ main ]
workflow_dispatch:

jobs:
build:
name: windows
runs-on: windows-latest
defaults:
run:
shell: msys2 {0}

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: 'Setup'
uses: msys2/setup-msys2@v2
with:
msystem: UCRT64
update: true
install: >-
mingw-w64-ucrt-x86_64-gcc
mingw-w64-ucrt-x86_64-cmake
mingw-w64-ucrt-x86_64-ninja
mingw-w64-ucrt-x86_64-postgresql
mingw-w64-ucrt-x86_64-postgis
mingw-w64-ucrt-x86_64-gsl
- name: Configure
run: |
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release ..
- name: Build
run: |
cd build
cmake --build .
cmake --install .
- name: Test install
run: |
# Create a new PostgreSQL database cluster
export PGDATA="D:/a/_temp/msys64/usr/local/pgsql/data"
initdb
# Configure PostgreSQL for MobilityDB
{
echo "port = 5432"
echo "shared_preload_libraries = 'postgis-3.dll'"
echo "max_locks_per_transaction = 128"
} >> "${PGDATA}/postgresql.conf"
# Start PostgreSQL
pg_ctl start
# Create database and add the MobilityDB extension
createdb -U runneradmin mydb
psql -p 5432 -U runneradmin -d mydb -c "CREATE EXTENSION mobilitydb CASCADE; SELECT postgis_full_version(); SELECT mobilitydb_full_version(); SELECT tfloat '[1@2000-01-01]';"
# - name: Run tests
# run: |
# cd build
# ctest --output-on-failure
46 changes: 0 additions & 46 deletions .travis.yml

This file was deleted.

36 changes: 0 additions & 36 deletions .travis_osx.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .travis_xenial.yml

This file was deleted.

Loading

0 comments on commit ae74a3f

Please sign in to comment.