Browse Source

Add Go 1.9 and 1.10 to travis build, simplify geoip

Ask Bjørn Hansen 7 years ago
parent
commit
8bc5da93f0
1 changed files with 6 additions and 8 deletions
  1. 6 8
      .travis.yml

+ 6 - 8
.travis.yml

@@ -2,12 +2,10 @@ language: go
 go:
   - 1.7.4
   - 1.8.3
+  - 1.9.4
+  - 1.10
   - tip
 
-env:
-  global:
-  - GO15VENDOREXPERIMENT='1'
-
 before_install:
   # because travis-ci is running an older ubuntu, we add the maxmind repository
   # to get geoipupdate
@@ -20,10 +18,10 @@ install:
   - curl -fso /tmp/GeoIP.conf http://geodns.bitnames.com/geoip/GeoIP.conf
   - sudo mv /tmp/GeoIP.conf /etc/
   - sudo geoipupdate
-  - sudo ln -s /usr/share/GeoIP $TRAVIS_BUILD_DIR/db
-  - sudo ln -s /usr/share/GeoIP/GeoLite2-Country.mmdb /usr/share/GeoIP/GeoIP2-Country.mmdb
-  - echo [geodns] >> dns/geodns.conf
-  - echo Directory=/usr/share/GeoIP/ >> dns/geodns.conf
+# - sudo ln -s /usr/share/GeoIP $TRAVIS_BUILD_DIR/db
+# - sudo ln -s /usr/share/GeoIP/GeoLite2-Country.mmdb /usr/share/GeoIP/GeoIP2-Country.mmdb
+# - echo [geodns] >> dns/geodns.conf
+# - echo Directory=/usr/share/GeoIP/ >> dns/geodns.conf
   - go build -v
   - go install