unscrew travis-ci (#1223)

* update travis ci clang-format to clang-format-9 because we use that now
add python3-dev package becuase something inside ci thinks it has python but really does not

* try using python3.6

* try working around hot garbage that is travis-ci

* add deadsnakes repo for python3.8

* prevent nullptr deference when running in unit tests

* move python3.8 to main dependancy matrix and add python3.8 to homebrew deps

* add deadsnake apt repo

* add deadsnakes and python3.8 back to previous matrix

* dev package for python

* toggle hive build in ci

* dont add pybind11 if not bulding hive

* revert setting pyenv shim for travis ci

* make native builds on by default except for windows ci

* only apply native build being off for windows release target becuase that broke macos
pull/1232/head
Jeff 4 years ago committed by GitHub
parent 9d9776d5ca
commit 5b1941222b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -10,30 +10,33 @@ matrix:
- name: "lint check"
os: linux
compiler: gcc
env: MAKE_TARGET=format-verify PATH="/usr/lib/llvm-8/bin:$PATH"
env: MAKE_TARGET=format-verify PATH="/usr/lib/llvm-9/bin:$PATH"
addons:
apt:
sources:
- llvm-toolchain-bionic-8
- llvm-toolchain-bionic-9
packages:
- clang-format-8
- clang-format-9
- name: "make debug (linux/gcc)"
os: linux
compiler: gcc
env: BUILD_TYPE=Debug IS_NOTIFICATION=1
addons: &core_apt_addons
apt:
sources:
- deadsnakes
packages:
- build-essential
- cmake
- curl
- git
- libcap-dev
- libcurl4-openssl-dev
- libuv1-dev
- ninja-build
- libsodium-dev
- libsystemd-dev
- build-essential
- cmake
- curl
- git
- libcap-dev
- libcurl4-openssl-dev
- libuv1-dev
- ninja-build
- libsodium-dev
- libsystemd-dev
- python3.8
- name: "make release (linux/gcc)"
os: linux
compiler: gcc
@ -125,11 +128,11 @@ matrix:
env: BUILD_TYPE=Release
- name: "windows installer"
os: linux
env: MAKE_TARGET=windows STATIC_LINK=ON DOWNLOAD_SODIUM=ON
env: MAKE_TARGET=windows STATIC_LINK=ON DOWNLOAD_SODIUM=ON NATIVE=OFF
allow_failures:
- name: "windows installer"
os: linux
env: MAKE_TARGET=windows STATIC_LINK=ON DOWNLOAD_SODIUM=ON
env: MAKE_TARGET=windows STATIC_LINK=ON DOWNLOAD_SODIUM=ON NATIVE=OFF
- name: "make windows docker image"
os: linux
dist: xenial
@ -162,6 +165,8 @@ env:
addons:
apt:
sources:
- deadsnakes
packages:
- binutils-gold
- build-essential
@ -180,6 +185,7 @@ addons:
- mingw-w64 mingw-w64-common
- ninja-build
- libsodium-dev
- python3.8-dev
homebrew:
update: true
packages:
@ -190,6 +196,7 @@ addons:
- make
- ninja
- libsodium
- python@3.8
before_install:
- if [ "$TRAVIS_OS_NAME" == "windows" ]; then

@ -279,7 +279,9 @@ if(SUBMODULE_CHECK)
endif()
endif()
add_subdirectory(external/pybind11 EXCLUDE_FROM_ALL)
if(WITH_HIVE)
add_subdirectory(external/pybind11 EXCLUDE_FROM_ALL)
endif()
if(WITH_TESTS)
add_subdirectory(external/googletest EXCLUDE_FROM_ALL)
@ -311,7 +313,9 @@ add_subdirectory(crypto)
add_subdirectory(llarp)
add_subdirectory(libabyss)
add_subdirectory(daemon)
add_subdirectory(pybind)
if(WITH_HIVE)
add_subdirectory(pybind)
endif()

@ -83,7 +83,6 @@ TOOLCHAIN ?=
# 64 for 64bit windows, 32 for 32bit windows
# defaults to 64 bit for now
WINDOWS_ARCH ?= 64
# native avx2 code
AVX2 ?= OFF
# statically link everything
@ -288,7 +287,7 @@ windows-debug: windows-debug-configure
windows-release-configure: $(LIBUV_PREFIX)
mkdir -p '$(BUILD_ROOT)'
$(CONFIG_CMD_WINDOWS) -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE='$(REPO)/contrib/cross/mingw$(WINDOWS_ARCH).cmake' -DCMAKE_ASM_FLAGS='$(ASFLAGS)' -DCMAKE_C_FLAGS='$(CFLAGS)' -DCMAKE_CXX_FLAGS='$(CXXFLAGS)' -DLIBUV_ROOT='$(LIBUV_PREFIX)' -DWITH_TESTS=OFF '$(REPO)'
$(CONFIG_CMD_WINDOWS) -DNATIVE_BUILD=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE='$(REPO)/contrib/cross/mingw$(WINDOWS_ARCH).cmake' -DCMAKE_ASM_FLAGS='$(ASFLAGS)' -DCMAKE_C_FLAGS='$(CFLAGS)' -DCMAKE_CXX_FLAGS='$(CXXFLAGS)' -DLIBUV_ROOT='$(LIBUV_PREFIX)' -DWITH_TESTS=OFF '$(REPO)'
windows-release: windows-release-configure
$(MAKE) -C '$(BUILD_ROOT)'

@ -17,8 +17,10 @@ namespace llarp
{
auto msg = new FindRouterMessage(peer.txid);
auto router = parent->GetRouter();
router->NotifyRouterEvent<tooling::FindRouterSentEvent>(router->pubkey(), *msg);
if (router)
{
router->NotifyRouterEvent<tooling::FindRouterSentEvent>(router->pubkey(), *msg);
}
parent->DHTSendTo(peer.node.as_array(), msg);
}

Loading…
Cancel
Save