diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 207c5405..a0b4a5a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,10 +19,11 @@ jobs: steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable + - uses: cargo-bins/cargo-binstall@main - uses: actions/setup-go@v2 with: go-version: 1.16 - - run: sudo apt-get install -y lftp bgpdump tree + - run: sudo apt-get install -y lftp bgpdump tree jq - uses: actions/cache@v3 with: key: ${{ runner.os }}-build-dependencies diff --git a/common.sh b/common.sh index f21af1e2..e5163098 100755 --- a/common.sh +++ b/common.sh @@ -20,10 +20,10 @@ get_asn(){ } prepare_data_v4(){ - curl -sSLo rib.bz2 http://archive.routeviews.org/dnszones/rib.bz2 - stat rib.bz2 + bgpkit-broker latest -c rrc00 --json | jq -c '.[] | select( .data_type | contains("rib")) | .url' | head -n 1 | xargs curl -sSL -o rib.gz + stat rib.gz log_info "runing bgpdump v4 ..." - bgpdump -m -O rib.txt rib.bz2 + bgpdump -m -O rib.txt rib.gz stat rib.txt log_info "finish bgpdump v4" } diff --git a/dependency.sh b/dependency.sh index 0873e71e..5ef04be4 100755 --- a/dependency.sh +++ b/dependency.sh @@ -8,5 +8,13 @@ cidr-merger --version || \ bgptools --version | grep -F $BGPTOOLS_VERSION || \ cargo install --version $BGPTOOLS_VERSION bgptools +bgpkit-parser --version || \ + cargo binstall --secure --no-confirm bgpkit-parser@0.10.6 + +bgpkit-broker --version || \ + cargo binstall --secure --no-confirm bgpkit-broker@0.7.0-beta.5 + cidr-merger --version bgptools --version +bgpkit-parser --version +bgpkit-broker --version