Skip to content

Commit 3a0ac1a

Browse files
committed
appveyor: disable 32bit built
1 parent 68e9270 commit 3a0ac1a

File tree

1 file changed

+20
-31
lines changed

1 file changed

+20
-31
lines changed

appveyor.yml

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ environment:
2020
POSTGIS_URL: "https://lonvia.dev.openstreetmap.org/osm2pgsql-winbuild/postgis-bundle-pg96-2.4.3x64.zip"
2121
PGUSER: postgres
2222
PGPASSWORD: Password12!
23-
matrix:
24-
- arch: x86
25-
- arch: x64
2623

2724
os: Visual Studio 2015
2825

@@ -35,37 +32,29 @@ clone_depth: 1
3532

3633
init:
3734
- git config --global core.autocrlf input
38-
- set bz2_dll_url=https://github.com/philr/bzip2-windows/releases/download/v%BZIP2_VER%/bzip2-dll-%BZIP2_VER%-win-%arch%.zip
39-
- set bz2_dev_url=https://github.com/philr/bzip2-windows/releases/download/v%BZIP2_VER%/bzip2-dev-%BZIP2_VER%-win-%arch%.zip
40-
- if "%arch%"=="x86" (
41-
set vcvarsall_arg=x86&&
42-
set conda_path=C:\Miniconda36\Scripts&&
43-
set python_path=C:\Python38&&
44-
set conda_library_path=C:\Miniconda36\envs\osm2pgsql\Library&&
45-
set lua_url=https://lonvia.dev.openstreetmap.org/osm2pgsql-winbuild/lua_x86.zip&&
46-
set build_type=Release)
47-
- if "%arch%"=="x64" (
48-
set vcvarsall_arg=amd64&&
49-
set conda_path=C:\Miniconda36-x64\Scripts&&
50-
set python_path=C:\Python38-x64&&
51-
set conda_library_path=C:\Miniconda36-x64\envs\osm2pgsql\Library&&
52-
set lua_url=https://lonvia.dev.openstreetmap.org/osm2pgsql-winbuild/lua_x64.zip&&
53-
set build_type=Release)
35+
- set bz2_dll_url=https://github.com/philr/bzip2-windows/releases/download/v%BZIP2_VER%/bzip2-dll-%BZIP2_VER%-win-x64.zip
36+
- set bz2_dev_url=https://github.com/philr/bzip2-windows/releases/download/v%BZIP2_VER%/bzip2-dev-%BZIP2_VER%-win-x64.zip
37+
- set vcvarsall_arg=amd64
38+
- set conda_path=C:\Miniconda36-x64\Scripts
39+
- set python_path=C:\Python38-x64
40+
- set conda_library_path=C:\Miniconda36-x64\envs\osm2pgsql\Library
41+
- set lua_url=https://lonvia.dev.openstreetmap.org/osm2pgsql-winbuild/lua_x64.zip
42+
- set build_type=Release
5443
- '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall" %vcvarsall_arg%'
5544

5645
install:
57-
- set PATH=%TESTS_POSTGRESQL_ROOt%\bin;%python_path%;%PATH%;%conda_path%
46+
- set PATH=%TESTS_POSTGRESQL_ROOT%\bin;%python_path%;%PATH%;%conda_path%
5847
- cd c:\
5948
- conda config --set always_yes yes
6049
- conda create --name osm2pgsql
6150
- activate osm2pgsql
6251
- conda install expat=%EXPAT_VER% proj4=%PROJ4_VER% zlib=%ZLIB_VER% postgresql=%POSTGRESQL_VER%
63-
- ps: if (!(Test-Path "C:\bzip2_dll_$env:arch.zip")){(new-object net.webclient).DownloadFile($env:bz2_dll_url, "C:\bzip2_dll_$env:arch.zip")}
64-
- 7z x -y C:\bzip2_dll_%arch%.zip -o%BZIP2_LIBRARY%
65-
- ps: if (!(Test-Path "C:\bzip2_dev_$env:arch.zip")){(new-object net.webclient).DownloadFile($env:bz2_dev_url, "C:\bzip2_dev_$env:arch.zip")}
66-
- 7z x -y C:\bzip2_dev_%arch%.zip -o%BZIP2_INCLUDE_DIR%
67-
- ps: if (!(Test-Path "C:\lua_$env:arch.zip")){(new-object net.webclient).DownloadFile($env:lua_url, "C:\lua_$env:arch.zip")}
68-
- 7z x -y C:\lua_%arch%.zip -oC:\lua
52+
- ps: if (!(Test-Path "C:\bzip2_dll_x64.zip")){(new-object net.webclient).DownloadFile($env:bz2_dll_url, "C:\bzip2_dll_x64.zip")}
53+
- 7z x -y C:\bzip2_dll_x64.zip -o%BZIP2_LIBRARY%
54+
- ps: if (!(Test-Path "C:\bzip2_dev_x64.zip")){(new-object net.webclient).DownloadFile($env:bz2_dev_url, "C:\bzip2_dev_x64.zip")}
55+
- 7z x -y C:\bzip2_dev_x64.zip -o%BZIP2_INCLUDE_DIR%
56+
- ps: if (!(Test-Path "C:\lua_x64.zip")){(new-object net.webclient).DownloadFile($env:lua_url, "C:\lua_x64.zip")}
57+
- 7z x -y C:\lua_x64.zip -oC:\lua
6958
- ps: if (!(Test-Path "C:\postgis.zip")){(new-object net.webclient).DownloadFile($env:POSTGIS_URL, "C:\postgis.zip")}
7059
- 7z x C:\postgis.zip -oC:\postgis
7160
- xcopy /e /y /q C:\postgis\postgis-bundle-pg96-2.4.3x64 %TESTS_POSTGRESQL_ROOT%
@@ -109,7 +98,7 @@ after_build:
10998
- copy /y %conda_library_path%\bin\wshelp64.dll osm2pgsql-bin
11099
- copy /y %BZIP2_LIBRARY%\libbz2.dll osm2pgsql-bin
111100
- copy /y %LUA_DLL% osm2pgsql-bin
112-
- 7z a c:\osm2pgsql\osm2pgsql_%build_type%_%arch%.zip osm2pgsql-bin -tzip
101+
- 7z a c:\osm2pgsql\osm2pgsql_%build_type%_x64.zip osm2pgsql-bin -tzip
113102

114103
before_test:
115104
- cd c:\
@@ -127,10 +116,10 @@ test_script:
127116
- ctest -VV -LE FlatNodes # enable when Postgis will be available
128117

129118
artifacts:
130-
- path: osm2pgsql_%build_type%_%arch%.zip
119+
- path: osm2pgsql_%build_type%_x64.zip
131120

132121
cache:
133-
- C:\lua_%arch%.zip -> appveyor.yml
134-
- C:\bzip2_dev_%arch%.zip -> appveyor.yml
135-
- C:\bzip2_dll_%arch%.zip -> appveyor.yml
122+
- C:\lua_x64.zip -> appveyor.yml
123+
- C:\bzip2_dev_x64.zip -> appveyor.yml
124+
- C:\bzip2_dll_x64.zip -> appveyor.yml
136125
- C:\postgis.zip -> appveyor.yml

0 commit comments

Comments
 (0)