From 594bb43ac223a0db18ae0a51f6f18b36e59d4b3f Mon Sep 17 00:00:00 2001
From: Yifan Gao <git@yfgao.com>
Date: Wed, 1 Jan 2020 20:03:19 +0800
Subject: [PATCH] Build cidr-merger from source

---
 .travis.yml   | 12 +++++++-----
 dependency.sh | 15 +++++++++++++++
 generate.sh   |  4 ++--
 3 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100755 dependency.sh

diff --git a/.travis.yml b/.travis.yml
index 583fc583..3d89ff2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,16 @@ addons:
 services:
     - docker
 language: rust
-cache: cargo
+cache:
+  cargo: true
+  directories:
+    - /home/travis/go/bin
 env:
   global:
   - BGPTOOLS_VERSION=0.0.3
-before_script:
-  - bgptools --version | grep -F $BGPTOOLS_VERSION || cargo install --vers $BGPTOOLS_VERSION bgptools
-  - export PATH=$PATH:/home/travis/.cargo/bin
-  - docker pull yangzhaofengsteven/cidr-merge
+install:
+  - export PATH=$PATH:$HOME/go/bin
+  - ./dependency.sh
 script:
   - ./generate.sh
   - ./stat.sh
diff --git a/dependency.sh b/dependency.sh
new file mode 100755
index 00000000..06689216
--- /dev/null
+++ b/dependency.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -ex
+
+cidr-merger --version || {
+    curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
+    chmod +x ~/bin/gimme
+    eval "$(gimme stable)"
+    go get github.com/zhanhb/cidr-merger
+}
+bgptools --version | grep -F $BGPTOOLS_VERSION || \
+    cargo install --vers $BGPTOOLS_VERSION bgptools
+
+cidr-merger --version
+bgptools --version
diff --git a/generate.sh b/generate.sh
index 0bdcc4d6..5e8768ec 100755
--- a/generate.sh
+++ b/generate.sh
@@ -12,8 +12,8 @@ for file in operator/*.conf; do
 	operator=${operator##*/}
 	log_info "generating IP list of $operator ..."
 	get_asn $file
-	get_asn $file | xargs bgptools -b rib.txt  | sort | uniq | docker run -i --rm yangzhaofengsteven/cidr-merge > result/${operator}.txt &
-	get_asn $file | xargs bgptools -b rib6.txt | sort | uniq | docker run -i --rm yangzhaofengsteven/cidr-merge > result/${operator}6.txt &
+	get_asn $file | xargs bgptools -b rib.txt  | cidr-merger > result/${operator}.txt &
+	get_asn $file | xargs bgptools -b rib6.txt | cidr-merger > result/${operator}6.txt &
 done
 
 wait