From 2e01107d9a385e46a57d95418599c09cacc53f7e Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Wed, 19 Jan 2022 17:29:23 +0100 Subject: [PATCH 1/8] Do appveyor build with VS 2022 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2fb2cf172..d77792ed7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,7 +21,7 @@ environment: PGUSER: postgres PGPASSWORD: Password12! -os: Visual Studio 2015 +os: Visual Studio 2022 services: - postgresql96 From acef0449a9227847074f6496029279878507ca58 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Wed, 19 Jan 2022 17:38:07 +0100 Subject: [PATCH 2/8] another try --- appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d77792ed7..a32fa7455 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ environment: global: BZIP2_VER: 1.0.8.0 - EXPAT_VER: 2.2.5 - PROJ4_VER: 4.9.3 + EXPAT_VER: 2.4.1 + PROJ_VER: 7.0.1 ZLIB_VER: 1.2.11 LUA_VER: 5.3.4 LUA_INCLUDE_DIR: C:\lua\include @@ -13,7 +13,7 @@ environment: GETOPT_LIBRARY: C:\wingetopt\build\wingetopt.lib BZIP2_INCLUDE_DIR: C:\bzip2\dev BZIP2_LIBRARY: C:\bzip2\dll - BOOST_PATH: C:\Libraries\boost_1_63_0 + BOOST_PATH: C:\Libraries\boost_1_77_0 POSTGRESQL_VER: 11.2 TESTS_POSTGRESQL_ROOT: C:\Progra~1\PostgreSQL\9.6 POSTGIS_VER: 2.4.3 @@ -40,7 +40,7 @@ init: - set conda_library_path=C:\Miniconda36-x64\envs\osm2pgsql\Library - set lua_url=https://osm2pgsql.org/ci/winbuild/lua_x64.zip - set build_type=Release - - '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall" %vcvarsall_arg%' + - '"C:\Program Files (x86)\Microsoft Visual Studio 17.0\VC\vcvarsall" %vcvarsall_arg%' install: - set PATH=%TESTS_POSTGRESQL_ROOT%\bin;%python_path%;%PATH%;%conda_path% @@ -48,7 +48,7 @@ install: - conda config --set always_yes yes - conda create --name osm2pgsql - activate osm2pgsql - - conda install expat=%EXPAT_VER% proj4=%PROJ4_VER% zlib=%ZLIB_VER% postgresql=%POSTGRESQL_VER% + - conda install expat=%EXPAT_VER% proj4=%PROJ_VER% zlib=%ZLIB_VER% postgresql=%POSTGRESQL_VER% - ps: if (!(Test-Path "C:\bzip2_dll_x64.zip")){(new-object net.webclient).DownloadFile($env:bz2_dll_url, "C:\bzip2_dll_x64.zip")} - 7z x -y C:\bzip2_dll_x64.zip -o%BZIP2_LIBRARY% - ps: if (!(Test-Path "C:\bzip2_dev_x64.zip")){(new-object net.webclient).DownloadFile($env:bz2_dev_url, "C:\bzip2_dev_x64.zip")} @@ -74,7 +74,7 @@ build_script: - cd c:\osm2pgsql\build - > cmake .. -LA -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%build_type% -DBUILD_TESTS=ON - -DLUA_INCLUDE_DIR=%LUA_INCLUDE_DIR% -DLUA_LIBRARIES=%LUA_LIBRARIES% + -DLUA_INCLUDE_DIR=%LUA_INCLUDE_DIR% -DLUA_LIBRARIES=%LUA_LIBRARIES% -DGETOPT_INCLUDE_DIR=%GETOPT_INCLUDE_DIR% -DGETOPT_LIBRARY=%GETOPT_LIBRARY% -DBOOST_ROOT=%BOOST_PATH% -DBoost_USE_STATIC_LIBS=ON -DBZIP2_INCLUDE_DIR=%BZIP2_INCLUDE_DIR% From 11754ac84a8c555894488338f0cd263ad70e69d8 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Wed, 19 Jan 2022 17:38:25 +0100 Subject: [PATCH 3/8] disable github action --- .github/workflows/ci.yml | 248 --------------------------------------- 1 file changed, 248 deletions(-) delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index dcc4f8242..000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,248 +0,0 @@ -name: CI - -on: [ push, pull_request ] - -jobs: - macos: - runs-on: macos-latest - env: - LUA_VERSION: 5.4 - steps: - - uses: actions/checkout@v2 - - - name: Install prerequisites - run: | - brew install lua boost postgis pandoc - pip3 install psycopg2 - pg_ctl -D /usr/local/var/postgres start - shell: bash - - - name: Setup database - run: | - psql -d postgres -c 'CREATE EXTENSION postgis' - psql -d postgres -c 'CREATE EXTENSION hstore' - psql -d postgres -c 'SELECT PostGIS_Full_Version()' - mkdir -m 700 $GITHUB_WORKSPACE/tablespacetest - psql -d postgres -c "CREATE TABLESPACE tablespacetest LOCATION '$GITHUB_WORKSPACE/tablespacetest'" - shell: bash - - - uses: ./.github/actions/build-and-test - with: - test-wrapper: '' - env: - PGHOST: /tmp - - - ubuntu18-pg95-gcc7-jit: - runs-on: ubuntu-18.04 - - env: - CC: gcc-7 - CXX: g++-7 - LUA_VERSION: 5.3 - LUAJIT_OPTION: ON - POSTGRESQL_VERSION: 9.5 - POSTGIS_VERSION: 2.4 - BUILD_TYPE: Release - - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/ubuntu-prerequisites - - uses: ./.github/actions/build-and-test - - ubuntu18-pg96-clang8-jit: - runs-on: ubuntu-18.04 - - env: - CC: clang-8 - CXX: clang++-8 - LUA_VERSION: 5.3 - LUAJIT_OPTION: ON - POSTGRESQL_VERSION: 9.6 - POSTGIS_VERSION: 2.4 - BUILD_TYPE: Release - - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/ubuntu-prerequisites - - uses: ./.github/actions/build-and-test - - ubuntu18-pg10-gcc9: - runs-on: ubuntu-18.04 - - env: - CC: gcc-9 - CXX: g++-9 - LUA_VERSION: 5.3 - LUAJIT_OPTION: OFF - POSTGRESQL_VERSION: 10 - POSTGIS_VERSION: 3 - CPP_VERSION: 14 - BUILD_TYPE: Debug - - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/ubuntu-prerequisites - - uses: ./.github/actions/build-and-test - - - ubuntu18-pg11-clang9: - runs-on: ubuntu-18.04 - - env: - CC: clang-9 - CXX: clang++-9 - LUA_VERSION: 5.3 - LUAJIT_OPTION: OFF - POSTGRESQL_VERSION: 11 - POSTGIS_VERSION: 2.5 - CPP_VERSION: 14 - BUILD_TYPE: Debug - - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/ubuntu-prerequisites - - uses: ./.github/actions/build-and-test - - ubuntu20-pg12-gcc10-jit: - runs-on: ubuntu-20.04 - - env: - CC: gcc-10 - CXX: g++-10 - LUA_VERSION: 5.3 - LUAJIT_OPTION: ON - POSTGRESQL_VERSION: 12 - POSTGIS_VERSION: 2.5 - CPP_VERSION: 14 - BUILD_TYPE: Debug - - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/ubuntu-prerequisites - - uses: ./.github/actions/build-and-test - - - ubuntu20-pg13-clang10-jit: - runs-on: ubuntu-20.04 - - env: - CC: clang-10 - CXX: clang++-10 - LUA_VERSION: 5.3 - LUAJIT_OPTION: ON - POSTGRESQL_VERSION: 13 - POSTGIS_VERSION: 3 - CPP_VERSION: 14 - BUILD_TYPE: Debug - - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/ubuntu-prerequisites - - uses: ./.github/actions/build-and-test - - ubuntu20-pg13-clang10-proj6: - runs-on: ubuntu-20.04 - - env: - CC: clang-10 - CXX: clang++-10 - LUA_VERSION: 5.3 - LUAJIT_OPTION: OFF - POSTGRESQL_VERSION: 13 - POSTGIS_VERSION: 3 - CPP_VERSION: 14 - USE_PROJ_LIB: 6 - BUILD_TYPE: Debug - - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/ubuntu-prerequisites - - uses: ./.github/actions/build-and-test - - ubuntu20-pg13-clang10-noproj: - runs-on: ubuntu-20.04 - - env: - CC: clang-10 - CXX: clang++-10 - LUA_VERSION: 5.3 - LUAJIT_OPTION: OFF - POSTGRESQL_VERSION: 13 - POSTGIS_VERSION: 3 - CPP_VERSION: 14 - USE_PROJ_LIB: off - BUILD_TYPE: Debug - - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/ubuntu-prerequisites - - uses: ./.github/actions/build-and-test - - ubuntu20-pg13-clang10-cpp17: - runs-on: ubuntu-20.04 - - env: - CC: clang-10 - CXX: clang++-10 - LUA_VERSION: 5.3 - LUAJIT_OPTION: OFF - POSTGRESQL_VERSION: 14 - POSTGIS_VERSION: 3 - CPP_VERSION: 17 - USE_PROJ_LIB: 6 - BUILD_TYPE: Debug - - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/ubuntu-prerequisites - - uses: ./.github/actions/build-and-test - - ubuntu20-pg13-gcc10-release: - runs-on: ubuntu-20.04 - - env: - CC: gcc-10 - CXX: g++-10 - LUA_VERSION: 5.3 - LUAJIT_OPTION: ON - POSTGRESQL_VERSION: 13 - POSTGIS_VERSION: 2.5 - CPP_VERSION: 14 - BUILD_TYPE: Release - - steps: - - uses: actions/checkout@v2 - - uses: ./.github/actions/ubuntu-prerequisites - - uses: ./.github/actions/build-and-test - - windows-2019: - runs-on: windows-2019 - env: - GETOPT_INCLUDE_DIR: ${{ github.workspace }}/../wingetopt/src - GETOPT_LIBRARY: ${{ github.workspace }}/../wingetopt/build/Release/wingetopt.lib - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - uses: ./.github/actions/win-install - - uses: ./.github/actions/win-getopt - - uses: ./.github/actions/win-cmake - - uses: ./.github/actions/win-build - - uses: ./.github/actions/win-test - - windows-2022: - runs-on: windows-2022 - env: - GETOPT_INCLUDE_DIR: ${{ github.workspace }}/../wingetopt/src - GETOPT_LIBRARY: ${{ github.workspace }}/../wingetopt/build/Release/wingetopt.lib - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - uses: ./.github/actions/win-install - - uses: ./.github/actions/win-getopt - - uses: ./.github/actions/win-cmake - - uses: ./.github/actions/win-build - - uses: ./.github/actions/win-test - From 0a493123d2561d10c54942dcf2c7c5a063693a16 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Wed, 19 Jan 2022 17:42:50 +0100 Subject: [PATCH 4/8] try new path --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a32fa7455..02443d675 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,7 +40,7 @@ init: - set conda_library_path=C:\Miniconda36-x64\envs\osm2pgsql\Library - set lua_url=https://osm2pgsql.org/ci/winbuild/lua_x64.zip - set build_type=Release - - '"C:\Program Files (x86)\Microsoft Visual Studio 17.0\VC\vcvarsall" %vcvarsall_arg%' + - '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"' install: - set PATH=%TESTS_POSTGRESQL_ROOT%\bin;%python_path%;%PATH%;%conda_path% From 2dcc1498e7682b83dc0c29cbad249af66ee3f14a Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Wed, 19 Jan 2022 17:44:32 +0100 Subject: [PATCH 5/8] try with 2022 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 02443d675..72ce96feb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,7 +40,7 @@ init: - set conda_library_path=C:\Miniconda36-x64\envs\osm2pgsql\Library - set lua_url=https://osm2pgsql.org/ci/winbuild/lua_x64.zip - set build_type=Release - - '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"' + - '"C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"' install: - set PATH=%TESTS_POSTGRESQL_ROOT%\bin;%python_path%;%PATH%;%conda_path% From 8c7d4766e08b594f8ff5a740a448e7e08f6ea59e Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Wed, 19 Jan 2022 17:46:06 +0100 Subject: [PATCH 6/8] try with 2019 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 72ce96feb..93f325ab1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,7 +21,7 @@ environment: PGUSER: postgres PGPASSWORD: Password12! -os: Visual Studio 2022 +os: Visual Studio 2019 services: - postgresql96 @@ -40,7 +40,7 @@ init: - set conda_library_path=C:\Miniconda36-x64\envs\osm2pgsql\Library - set lua_url=https://osm2pgsql.org/ci/winbuild/lua_x64.zip - set build_type=Release - - '"C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"' + - '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"' install: - set PATH=%TESTS_POSTGRESQL_ROOT%\bin;%python_path%;%PATH%;%conda_path% From 896ca1fa9a70ebba34e27c94afeecfa3a0394b2c Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Wed, 19 Jan 2022 17:47:28 +0100 Subject: [PATCH 7/8] proj lib name --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 93f325ab1..f7eb0dd8e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,7 +48,7 @@ install: - conda config --set always_yes yes - conda create --name osm2pgsql - activate osm2pgsql - - conda install expat=%EXPAT_VER% proj4=%PROJ_VER% zlib=%ZLIB_VER% postgresql=%POSTGRESQL_VER% + - conda install expat=%EXPAT_VER% proj=%PROJ_VER% zlib=%ZLIB_VER% postgresql=%POSTGRESQL_VER% - ps: if (!(Test-Path "C:\bzip2_dll_x64.zip")){(new-object net.webclient).DownloadFile($env:bz2_dll_url, "C:\bzip2_dll_x64.zip")} - 7z x -y C:\bzip2_dll_x64.zip -o%BZIP2_LIBRARY% - ps: if (!(Test-Path "C:\bzip2_dev_x64.zip")){(new-object net.webclient).DownloadFile($env:bz2_dev_url, "C:\bzip2_dev_x64.zip")} From e448e8327af12fe9838227750e8ae1473a5230d2 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Wed, 19 Jan 2022 18:16:55 +0100 Subject: [PATCH 8/8] update proj search path --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f7eb0dd8e..c23492ccf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -108,7 +108,7 @@ before_test: - | psql -c "CREATE TABLESPACE tablespacetest LOCATION 'c:/temp'" - set PATH=c:\osm2pgsql\build\osm2pgsql-bin;%PATH% - - set PROJ_LIB=%conda_library_path%\share + - set PROJ_LIB=%conda_library_path%\share\proj test_script: - cd c:\osm2pgsql\build