From 5074dd1352fc75798523cff02a85f0f6a0dd286a Mon Sep 17 00:00:00 2001 From: Oliver Tonnhofer Date: Thu, 5 Apr 2018 20:10:45 +0200 Subject: [PATCH] travis: deploy releases to github with custom leveldb and geos --- .travis.yml | 132 +++++++++++++++++++++++---- Makefile | 11 ++- test/Makefile | 12 +-- test/any_any_test.go | 2 +- test/completedb_test.go | 4 +- test/expire_tiles_test.go | 4 +- test/generated/README | 2 + test/generated/any_any.pbf | Bin 0 -> 208 bytes test/generated/complete_db.osc.gz | Bin 0 -> 1438 bytes test/generated/complete_db.pbf | Bin 0 -> 2746 bytes test/generated/expire_tiles.osc.gz | Bin 0 -> 815 bytes test/generated/expire_tiles.pbf | Bin 0 -> 414 bytes test/generated/route_relation.osc.gz | Bin 0 -> 555 bytes test/generated/route_relation.pbf | Bin 0 -> 673 bytes test/generated/single_table.osc.gz | Bin 0 -> 351 bytes test/generated/single_table.pbf | Bin 0 -> 604 bytes test/route_relation_test.go | 4 +- test/single_table_test.go | 4 +- version.go | 13 +-- 19 files changed, 142 insertions(+), 46 deletions(-) create mode 100644 test/generated/README create mode 100644 test/generated/any_any.pbf create mode 100644 test/generated/complete_db.osc.gz create mode 100644 test/generated/complete_db.pbf create mode 100644 test/generated/expire_tiles.osc.gz create mode 100644 test/generated/expire_tiles.pbf create mode 100644 test/generated/route_relation.osc.gz create mode 100644 test/generated/route_relation.pbf create mode 100644 test/generated/single_table.osc.gz create mode 100644 test/generated/single_table.pbf diff --git a/.travis.yml b/.travis.yml index ef15122..00d9b0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1,132 @@ +dist: trusty +sudo: false + language: go go: - - 1.8.5 - - 1.9.2 - - tip + - "1.7.x" + - "1.9.x" + - "1.10.x" # we use this for releases, see deploy.on.condition below + - tip + +matrix: + allow_failures: + - go: tip + fast_finish: true + +env: + global: + - GEOS_VERSION=3.6.2 + - PROTOBUF_VERSION=3.5.1 + - LEVELDB_VERSION=1.21 # TODO: update before_script when 1.21 is released + # NOTE increase DEPS_REVISION everytime one of the compiled deps changes! + - DEPS_REVISION=1 + # PREFIX is where we install our compiled deps + - PREFIX=${HOME}/local-${DEPS_REVISION} + + # tell Go to find our compiled deps + - CGO_CFLAGS=-I${PREFIX}/include + - CGO_LDFLAGS=-L${PREFIX}/lib + - LD_LIBRARY_PATH=${PREFIX}/lib + + # PKG_DIR is where we assemble the final package for releases + - PKG_DIR=/tmp/imposm_packaging + + - PGUSER=postgres + + # enable ccache by updating PATH + - PATH=/usr/lib/ccache:$PATH + - CCACHE_TEMPDIR=/tmp/.ccache-temp + +cache: + directories: + - ${HOME}/.ccache + - ${PREFIX} addons: postgresql: "9.5" apt: + # List of whitelisted in travis packages for ubuntu-trusty can be found here: + # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-trusty packages: - postgresql-9.5-postgis-2.3 - - libgeos-dev - - libprotobuf-dev - - protobuf-compiler - - osmosis + - chrpath before_script: - psql -U postgres -c 'create database travis' || true - psql -U postgres -c "create extension if not exists postgis" - psql -U postgres -c "create extension if not exists hstore" -env: - global: - - PGUSER=postgres -install: - - LEVELDB_VER=1.18 - - curl -fsSL https://github.com/google/leveldb/archive/v${LEVELDB_VER}.tar.gz | tar -C ${HOME} -xzf - - - make -C ${HOME}/leveldb-${LEVELDB_VER} -j2 - - sudo mv ${HOME}/leveldb-${LEVELDB_VER}/libleveldb* /usr/lib - - sudo cp -a ${HOME}/leveldb-${LEVELDB_VER}/include/leveldb /usr/include +before_install: + - ccache --show-stats + + # build GEOS + - | + if [[ ! -e ${PREFIX}/lib/libgeos_c.so ]]; then + curl -fsSL http://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2 | \ + tar -jxf - -C ${HOME}/build + cd ${HOME}/build/geos-${GEOS_VERSION} + ./configure --prefix=$PREFIX + make -j2 + make install + fi + + # build LevelDB + - | + if [[ ! -e ${PREFIX}/lib/libleveldb.so ]]; then + mkdir -p ${HOME}/build/leveldb + curl -fsSL https://github.com/google/leveldb/archive/master.tar.gz | \ + tar -zxf - --strip-components 1 -C ${HOME}/build/leveldb + mkdir -p ${HOME}/build/leveldb/build + cd ${HOME}/build/leveldb/build + cmake .. -DBUILD_SHARED_LIBS=1 && make -j 2 + mkdir -p ${PREFIX}/{lib,include} + cp -R ${HOME}/build/leveldb/build/liblevel* ${PREFIX}/lib/ + cp -R ${HOME}/build/leveldb/include/leveldb ${PREFIX}/include/ + fi + + - ccache --show-stats + +script: + - cd ${TRAVIS_BUILD_DIR} + - LEVELDB_POST_121=1 make + +before_deploy: + - cd ${TRAVIS_BUILD_DIR} + - mkdir -p ${PKG_DIR}/lib + + # copy files + - cp imposm3 ${PKG_DIR} + - cp example-mapping.json ${PKG_DIR}/mapping.json + + # copy/link libs + - cd ${PREFIX}/lib + - cp libgeos_c.so ${PKG_DIR}/lib + - ln -s libgeos_c.so ${PKG_DIR}/lib/libgeos_c.so.1 + - cp libgeos.so ${PKG_DIR}/lib + - ln -s libgeos.so ${PKG_DIR}/lib/libgeos-${GEOS_VERSION}.so + - cp -R libleveldb.so* ${PKG_DIR}/lib + + # update RPATH of libgeos_c.so so that is points to our libgeos.so + - chrpath ${PKG_DIR}/lib/libgeos_c.so -r '${ORIGIN}' + + # create tar.gz + - BUILD_VERSION=`${PKG_DIR}/imposm3 version`-linux-x86-64 + - mv ${PKG_DIR} /tmp/imposm3-${BUILD_VERSION} + - cd /tmp && tar zcvf imposm3-${BUILD_VERSION}.tar.gz imposm3-${BUILD_VERSION} + + # move back to build dir for deploy + - cd ${TRAVIS_BUILD_DIR} + +deploy: + provider: releases + api_key: + secure: fBhtCy6vdxxxuLYuJWXeTHJb3SAZCCbUJncIvR9ZOLCDWMJAPBnzPoqJFbByWzl6XghVRwhy9fe/82vzqByKiB/AQpqGqBxlwA9dSsqvSQcQxomAoHKKfZVdOuxM2bLDW3v5pJpmFtCMwhWjgwIOb9WxnBVeLxBbsq2Ox49tgHw= + file: /tmp/imposm3-${BUILD_VERSION}.tar.gz + skip_cleanup: true + on: + repo: omniscale/imposm3 + tags: true + condition: $TRAVIS_GO_VERSION =~ ^1\.10(\.[0-9]+)?$ -script: make diff --git a/Makefile b/Makefile index 4ea60d9..62d3587 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,15 @@ endif BUILD_DATE=$(shell date +%Y%m%d) BUILD_REV=$(shell git rev-parse --short HEAD) -ifndef IMPOSM_BUILD_RELEASE -BUILD_VERSION=dev-$(BUILD_DATE)-$(BUILD_REV) +BUILD_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) +TAG=$(shell git name-rev --tags --name-only $(BUILD_REV)) +ifeq ($(TAG),undefined) + BUILD_VERSION=$(BUILD_BRANCH)-$(BUILD_DATE)-$(BUILD_REV) +else + # use TAG but strip v of v1.2.3 + BUILD_VERSION=$(TAG:v%=%) endif -VERSION_LDFLAGS=-X github.com/omniscale/imposm3.buildVersion=$(BUILD_VERSION) +VERSION_LDFLAGS=-X github.com/omniscale/imposm3.Version=$(BUILD_VERSION) all: build test diff --git a/test/Makefile b/test/Makefile index 5e94683..daf9382 100644 --- a/test/Makefile +++ b/test/Makefile @@ -9,17 +9,15 @@ endif all: test clean: - rm -rf build + rm generated/*.{pbf,gz} -PBF_FILES=$(addprefix build/,$(patsubst %.osm,%.pbf,$(wildcard *.osm))) -OSCGZ_FILES=$(addprefix build/,$(patsubst %.osc,%.osc.gz,$(wildcard *.osc))) +PBF_FILES=$(addprefix generated/,$(patsubst %.osm,%.pbf,$(wildcard *.osm))) +OSCGZ_FILES=$(addprefix generated/,$(patsubst %.osc,%.osc.gz,$(wildcard *.osc))) -build/%.pbf: %.osm - @mkdir -p build +generated/%.pbf: %.osm osmosis --read-xml $< --sort type="TypeThenId" --write-pbf $@ omitmetadata=true -build/%.osc.gz: %.osc - @mkdir -p build +generated/%.osc.gz: %.osc gzip --stdout $< > $@ files: $(PBF_FILES) $(OSCGZ_FILES) diff --git a/test/any_any_test.go b/test/any_any_test.go index b7bc41c..86df7ed 100644 --- a/test/any_any_test.go +++ b/test/any_any_test.go @@ -20,7 +20,7 @@ func TestAnyAny_Prepare(t *testing.T) { ts.config = importConfig{ connection: "postgis://", cacheDir: ts.dir, - osmFileName: "build/any_any.pbf", + osmFileName: "generated/any_any.pbf", mappingFileName: "any_any_mapping.json", } ts.g = geos.NewGeos() diff --git a/test/completedb_test.go b/test/completedb_test.go index 1c2c060..9b64a81 100644 --- a/test/completedb_test.go +++ b/test/completedb_test.go @@ -29,7 +29,7 @@ func TestComplete_Prepare(t *testing.T) { ts.config = importConfig{ connection: "postgis://", cacheDir: ts.dir, - osmFileName: "build/complete_db.pbf", + osmFileName: "generated/complete_db.pbf", mappingFileName: "complete_db_mapping.json", } ts.g = geos.NewGeos() @@ -400,7 +400,7 @@ func TestComplete_HstoreTags(t *testing.T) { // ####################################################################### func TestComplete_Update(t *testing.T) { - ts.updateOsm(t, "./build/complete_db.osc.gz") + ts.updateOsm(t, "./generated/complete_db.osc.gz") } // ####################################################################### diff --git a/test/expire_tiles_test.go b/test/expire_tiles_test.go index 5a7e58c..051a62b 100644 --- a/test/expire_tiles_test.go +++ b/test/expire_tiles_test.go @@ -24,7 +24,7 @@ func TestExpireTiles_Prepare(t *testing.T) { ts.config = importConfig{ connection: "postgis://", cacheDir: ts.dir, - osmFileName: "build/expire_tiles.pbf", + osmFileName: "generated/expire_tiles.pbf", mappingFileName: "expire_tiles_mapping.yml", expireTileDir: filepath.Join(ts.dir, "expiretiles"), } @@ -62,7 +62,7 @@ func TestExpireTiles_Elements(t *testing.T) { } func TestExpireTiles_Update(t *testing.T) { - ts.updateOsm(t, "build/expire_tiles.osc.gz") + ts.updateOsm(t, "generated/expire_tiles.osc.gz") } func TestExpireTiles_CheckExpireFile(t *testing.T) { diff --git a/test/generated/README b/test/generated/README new file mode 100644 index 0000000..6f94e77 --- /dev/null +++ b/test/generated/README @@ -0,0 +1,2 @@ +Files in this directory are generated by `make files` in ./test by calling osmosis and gzip. +The sources for these files are in ./test. diff --git a/test/generated/any_any.pbf b/test/generated/any_any.pbf new file mode 100644 index 0000000000000000000000000000000000000000..eb2476e1590e16fef6056d3945d9ea5ddcbe673d GIT binary patch literal 208 zcmV;>05AUl000dN2~Sf^NM&JUWpWrm5HuP*c$`z>^DoW~PR>ZpP1FrD&@)rwa!JiA zPW8)ANiA+-6gAK@G14{DO;0nnOf)nz&`rrKDyakjla3Ek0000B3I|V9O+;aIVHj`_ zY#MBMoa55wV&GyfNlfQrDbC0*;9^hAP0h%P}HYIDzcnK3;1A@!^fH7o8b(-{`yavpf@UW zCivzaFT8t1`Bub??>F~Hh2U-CE@7?+3#7w3eNDi)e=Slv7ERkek_`c`9<2 zBX1Gl+4CJj>l9#iXZ;m^a1m3);>`?u9-cKY{tP8VZDzsKB80Dc2(RGlvVd4N80)R1 zL{STz9nV{M6`uZT))i|N*`wFZjFXhY!p-bABF%Q)`79w@Bk;zOgzRZ0v|j4njed<% zU2}h#&yg8GFGq#AP$-i$r(7Y%;lmUo31Vp`q(bw#%_{$0tMIT@KZdQ^GIh3@)N*-D z6KZ$4H$u7c2rG~tpro)25DHLVAERYO&#PO*!-VkonA1&0pLU9+G*=|e^yV1Pi_bUD`+_li{;qwy<}s3VS79uz!N|eH$ic+O5wejZWTO!w8;xRa^zqD%CNMYp?^xKOp*j%Vv_QfCz`yvq#d<`s zpn1{AfT~nNmq-hGKAb86veTtEOWtWpCX{_@>QSUU1JhJ)NZ+=qgxkj|cUW zmB48Ix{V3GN}0g;Voz0GRhL4y$=(u|3g`o>s#8mm+44is?`_AjvK1u;W$Bploii)v zOwgIJT!J};S~@23+~Q?(3EC+qX)4|r-y^YW@*fhOv9oV;1WTez5)g2OLTQy-Z;gbT&f5u8af! zI7!ZEOST7~AL9s)qKKAQM}#7!gbKUtFH+2P*A-R_};?v>crH+y|Vi2 z<6=AR>Q-Fef?M?SH{z}=xR3|KTX6#mF7)Zqt+=5D7jnbXt+jDtbzuT zv!v+Z zvz>Mt)47Ty$h0(&N^&aU&TH}6J4FpE^IdP_H7U+b-$=)#0YCg(^evR`d9vZS(wAWn2eml@Bgt%OVKn z2O`U7&?b1pM{6d$bT6#A81ZhUp*`7zUf3|!LJSAC1^DoW~PR>ZpP1FrD&@)rwa!JiA zPW8)ANiA+-6gAK@G14{DO;0nnOf)nz&`rrKDyakjla3Ek0000C3I|V9O+;aIVHnvI z5Y{Ui(-e4|#aDY&6xSJ_duL|nGAtkqD2}wKO-x@gynK+hrk%9X($==L_HFGVqwaCp zObN35B;;*VH<9aq=rYBb`XF-K2R8wy89`m3reNSJaHD5X{g!{Abj_ya-eOMwv8!gf3rKt9n}1a|CVMckal zPpP$LghN&SNSzB7i5w{HnHi4IZF1Xj6k_CrV!EOrU?uKqoUX+}b3);{Ar~rgSH!yhEeQ2_x&#qYaKo@pBU!p)G?$;l5i@`9ilKg*18Xkw7r$pJnMvX;EPTC&s(`8}Evt1xsD5 zNKf}yRR=-=Xi|R^DoL$@=dox6--b-zx=ejL?#jU8(}r+;I!^kuxzr(dg%4!l!JpQC zpljETl6+&_0hesNjV@bL;PP^Y05J{A@HQ{YC!X)nl-YCp#mgDVqHT_!kJ4}_W0q4S z-rRR(p%$bI-K`;T+4(4j3h*!7H4UFVC1bq2)$6F)wI z78!`yZ!TPh`SRfV8@iQ)aqpqHckq>dFTT{P3as~EC*?a7W7nSlDB}Lv^$nhZtyBJi zhi1$=hIS$;r{+ebl-7@-hw}tQ z!#w-MYnnv!Pb`_|;)$nDKBd~NtJ_qb4-E|uVc(6LDZLrsH;IKwH>}YHG-<_REd5_U=m+C|^VyA! z^3iv%_C0h5?zGp)CKojyM%ci=(oK#3t)dxOq(`8?)=kgb6jed`D)A{A%FZ$r0#{Rx zXJW%gUeE9$WT3B^T1&oT-j%`4OTqm4d}f|S{vp6g>858l2Q$guVI2IPVk(!%V(PG6 zKxK-lUK`6D?i1K#u>EAL$Y*0d2fwJ8TE`?FJDao!^vi($%|#pT<7f$>O;ZSh51>m0 zS_EkG6t4A=WdbcuH`UEl3wbUV*aPXNvKf?M+$f*|sND7`PN0v+a`bnAc29E(a#^6i z|EB4=G))xbiU6l6rspaLhm+IeIXEic^d7248dhkoDBZ{<`zQD?Mg~^CZ>IK!oIm|C zAmfb_eOLo#%8yO8qXs}Dg)A;Lm8B83tcPVw1P_OOtSt3`cLWhB0BkC`SZaE@YFT(f zdP+_CRILKalaqW%GY~O73+6L&DA_UDC*z^Wkd>StLAS6!04ctz%*CghT6_h^edNh9 z9~xtzADY@W7rRl$Q~gqImiB_#oF!j zaEz}Y(Fi-LxzYe-_ZdgIubL?zHnnRmwl>DF`%P_UkArRE*mzSrCa@vovH1+U*Hjnu zBG#1)=0gn4!1obTt?xz5av4|s%+#LjMdDB|E<#-REf97!(6h)SJq~CRQ+}fXgYMPE z0{XeD^O8;n{3S7R$m`3IPe$4o40!^%$5dO^Qc(`s`$xpLo0bNJ*@9W%9MbN<85yQl zztw@)tx8h2w>t3CtCG~60vU;Fx064h6xDWwI!dQ}_tb1J4LrpQoUTVW`JASNSmfBnOvJa&i z$P1&V(Ie`A@NpOHS>b?tS8#9y6s(zpX{3FH424?fXb#^_b0k@lMpmwd+ojw1twGM6 zl0{PK9b2`e|8(G)*x2ZS!-EMae?x(dbkP59WWZZo{Og6u_$C*BP}f}?Hre8J>fd!F z*V*JI7mOcsz)jD1McK6O~o=$ax^p z5CaYG19M0>buwg_frtO156&Zr{kc9BrT)Y>#84}|KmGPdlf?g9z($^Lr)P97d$)iR z>mC!!DdjR$rUD~0dMLS~`H*U$LHJFLZ9(skkDxCZtU|YX6jPQ{Qpy$juBnh=FpeHh z-yz(Y3|u*Tjc{rxeMLBNBa63kydeI0OIrS9Z%PZJy96)GFH;1kBU;}d9wPIB(k zfWZm}1>2IxD#9;}S?1S(St_{iI2=q?#tkDcO%mKh;E-I7o90&lkxRBt7Q|OLA$KoF z6>Qs$WrF#faHq7wAZ7j_#WJ@hjJmuMIc0<)$qFz0!KAEUDZrrYE4u=tGF$k9x!C6m zD0rSZl}ATmU+IBk6Vc}sgN?i7Ea)f`#b6^YnTs!TIX1)?_gx;54l=>9k)=)r&d=@W z*b+sgw&>bZKm5b1rXlV*ssKJ(HU-5bgad6g5r?3`pW8 z$rxXenY3vxO*+oVm^nZmz{&aFM-pEGOK_I$ae>$P>Fv|g?&9t9d!B*6w5(EAglm7} ztpP3eEKZ9gT>pOg>3m&3?^at@uIcL0ah!3sA z(#sQlIse2Ua$qNNz{Qx6IIxqLqXuSygS!O|v;qe<0#6TYNjYs!OnX-QFGV8!w0^TK zeL2lvX$k7fiH1-TlsVw0nwBi%VRo)*d0qZq&uJzG5}6Y_9MV0#zDWQ#NuRSiJ+bVP zuwtl_T^_T=a;n6rVosDmk5>ZSrUdT<_v&CM;eD#IjxRMt?BTl`B9@)tx*>`K zEcJ1Jq1Ik#rKuj%N1$$IiONJVB(LRJTF^yPB0E!}&7vofOaqmp-tow005gejbZ=* literal 0 HcmV?d00001 diff --git a/test/generated/expire_tiles.pbf b/test/generated/expire_tiles.pbf new file mode 100644 index 0000000000000000000000000000000000000000..99445a4bbb0531b9efd6e879ccb9d641d553b3ea GIT binary patch literal 414 zcmV;P0b%|C000dN2~Sf^NM&JUWpWrm5HuP*c$`z>^DoW~PR>ZpP1FrD&@)rwa!JiA zPW8)ANiA+-6gAK@G14{DO;0nnOf)nz&`rrKDyakjla3Ek0000C3I|V9O+;aIVHmvv z5bXmRw*q*aj(|DakCzq$&*NgQ zOfBYO&&W*AC{L{9;>gV}$u9!2Sc)_93%J-5b5rv&ODctSG74>DHGf z&mZm-1}g?B!NCZU=j333AnZV>NJ@ZX`&>pLMm8x%b|;puT}(_sk=gU$BA0f9MgAj1 zX6*%v@Nyh~&FI9w>KZf9SFAwp>Nh~{r|U3o|63q;*G(ArGl<)C8_X3-Q4;5P|C&*V ziHT8)iIv5Pk=cv6?>ci3BO_4a@*7l%Yd4@0+ux!}%)14ZnEeh_;@NGGLV>WZ*yY+l~uuVqCgP6`xU*Ds(1os zKvK~KQ<~ab_Yn88mlToFP+=HqW{C0cw;cshC|5m!@Ad1~Jv~kI^euAu;!0<-h=k znbmgph`*?iDTgeL38R$JfE<;40wxn&n?#iOMp@`E-wD{l4<_MwG9LdWkS8W4Vc=pc zzU-nNU1Sn(IymTWl5H&?p2)NR%O5`P6F zJalIJ;nfZ4Hb-$R5Z%@ljH%ylP|z)bJ~-50(9whi6V@(4aPiI+m~F|?4K|&eI0q$j z1hkRm8!wF7zR4orwhB6lN9)J%kTu~Y+FeN{u8=sl5VS2^nKwAkdu=km4*W=RgFz7e za2#0LQBExcj?+l(u!}zY9v=t``GsmNp^Ki_=^1=y=9VL1-6Ob7;dlU7^8Fk6tcQQN zB}vNHQz@0IStM(%Zc5bTM?_6o-}P~Y*(yTA^i{UgJfvP-in)5LHM&621mt+i9x tez0y?ddHpG+NkufNID&V#bNd9Y9eo!`K*x0YrYcG!9STA literal 0 HcmV?d00001 diff --git a/test/generated/route_relation.pbf b/test/generated/route_relation.pbf new file mode 100644 index 0000000000000000000000000000000000000000..0e1982733d74035d3e5e650b1189b8fac4fae347 GIT binary patch literal 673 zcmV;S0$%+9000dN2~Sf^NM&JUWpWrm5HuP*c$`z>^DoW~PR>ZpP1FrD&@)rwa!JiA zPW8)ANiA+-6gAK@G14{DO;0nnOf)nz&`rrKDyakjla3Ek0000C3I|V9O+;aIVHm&! z5Z?wGx&(NfU6H+S(?A%;eP{c8edEU9BqTKytgtaPtr(~TQXGL$1_t*JhyrnFL=s1i zL&??=Aq1_&hd@P?N_>c=AW;DW3`kwNfKWheNEHKOVr4sAR~+a2`(%AB7*=X|IKKD9A>Z7Nc=HE3?UXQ5lD0SWilOt{t4yZ{B!e1LmK2-; zwL7EQ^*{rDca>SvjgTJ({P}^JL|zZL7xJTkzlOXK@Hb@r9nGHQk8d%ZtNW#xLQ>4& zTsJ2sm@91W8*gni?Vh zC(ZJw<7YaENz=rVlL<^I!tgXHTkgBES-y!LrlKXy48{+mA#DX4N;}U~Y9nRSd}|l4 zk1&JE#3Eu*eEw$ACPH?aZ@*B64H2s-@AU9r+oC`P^nLj|XdmhOe*MCD$WP@T HQ<=tl=U6*o literal 0 HcmV?d00001 diff --git a/test/generated/single_table.osc.gz b/test/generated/single_table.osc.gz new file mode 100644 index 0000000000000000000000000000000000000000..fa984be212980291b5fa610380dcad8455d85959 GIT binary patch literal 351 zcmV-l0igaLiwFqAb+c9g19NF^XKZC(bYWs_WiD@XV*ssFu};G<5Z(I~hnGxg?6iV{ z;&wn{Who1rn_PlLY)7^Oll4siv0`)NKc2#i23|Q43bph@ zAm*eLHInSqIE$S}J=r8^CeC8$5Y+rt;3TI|s19hs4;^yyE`l73b)=*;57@Nf+4LUm zB=6^%)ps?gp<~TBvFckdJJSx0(et!JFWb1$F?B$9@n#x)?$1@4!ZC)kJC#8PrA6Tp xs=jMw8PTaNr0IO?UyaRg|J~Sp+||FEWa?U$_?u5fcK#RJ#V1b+S~5!m008f7riuUn literal 0 HcmV?d00001 diff --git a/test/generated/single_table.pbf b/test/generated/single_table.pbf new file mode 100644 index 0000000000000000000000000000000000000000..48dc3df075a719d721058214327d36d2e31ab20d GIT binary patch literal 604 zcmV-i0;Bx^000dN2~Sf^NM&JUWpWrm5HuP*c$`z>^DoW~PR>ZpP1FrD&@)rwa!JiA zPW8)ANiA+-6gAK@G14{DO;0nnOf)nz&`rrKDyakjla3Ek0000C3I|V9O+;aIVHo=Z z5YPo0^#gdERgS%H(?A%;eINE+-iAq@An4_>D!A@t8fU$xBBvj5x(}a`meeZtH^SpO(jKBhti4Hhgs4(sU z+l)G!w?zS@kSVaPp?NBSxALePMydmLoM%#l(-TP|Lm){Uf!)y}O#uv$X{IBgfaNL* zVy%E?MIxcvj=Cl$!)qoERA?!nlFA@fq0j|XdwDmDlDJ!RVg*FS#*+wr3rNe@oixsM zAc3`n){%J}0+Y{VxX~(r2BIwis~DK*Nfl)U*lno-=?;*)kD&hIDZ&S4WBlV~S%+x1 zW}1J!KYBkPR{wZZIV<-+UA6j0drQ{oTT>>-#*O~gtBslI^z*3FA8tLcXU4H%dTXv> zEhjZGLhE(DeFvXwh&9NEU!;l9E(!78nK*I^&27p literal 0 HcmV?d00001 diff --git a/test/route_relation_test.go b/test/route_relation_test.go index 88522c8..13e0c7b 100644 --- a/test/route_relation_test.go +++ b/test/route_relation_test.go @@ -20,7 +20,7 @@ func TestRouteRelation_Prepare(t *testing.T) { ts.config = importConfig{ connection: "postgis://", cacheDir: ts.dir, - osmFileName: "build/route_relation.pbf", + osmFileName: "generated/route_relation.pbf", mappingFileName: "route_relation_mapping.yml", } ts.g = geos.NewGeos() @@ -107,7 +107,7 @@ func TestRouteRelation_NoRouteWithMissingMember(t *testing.T) { // ####################################################################### func TestRouteRelation_Update(t *testing.T) { - ts.updateOsm(t, "./build/route_relation.osc.gz") + ts.updateOsm(t, "./generated/route_relation.osc.gz") } // ####################################################################### diff --git a/test/single_table_test.go b/test/single_table_test.go index 3bf2b05..690faf3 100644 --- a/test/single_table_test.go +++ b/test/single_table_test.go @@ -23,7 +23,7 @@ func TestSingleTable_Prepare(t *testing.T) { ts.config = importConfig{ connection: "postgis://", cacheDir: ts.dir, - osmFileName: "build/single_table.pbf", + osmFileName: "generated/single_table.pbf", mappingFileName: "single_table_mapping.json", } ts.g = geos.NewGeos() @@ -167,7 +167,7 @@ func TestSingleTable_DuplicateIds1(t *testing.T) { // ####################################################################### func TestSingleTable_Update(t *testing.T) { - ts.updateOsm(t, "./build/single_table.osc.gz") + ts.updateOsm(t, "./generated/single_table.osc.gz") } // ####################################################################### diff --git a/version.go b/version.go index f874629..fe6f1ca 100644 --- a/version.go +++ b/version.go @@ -1,12 +1,5 @@ package imposm3 -var Version string - -// buidVersion gets replaced while building with -// go build -ldflags "-X github.com/omniscale/imposm3.buildVersion 1234" -var buildVersion string - -func init() { - Version = "0.5.0" - Version += buildVersion -} +// Version gets replaced while building with +// go build -ldflags "-X github.com/omniscale/imposm3.Version 1.2.3" +var Version = "0.0.0-dev"