Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-15 12:13:24 +00:00
Code Issues Projects Releases Wiki Activity

more travis fixes

Browse Source
This commit is contained in:
Jeff Becker 2019-12-10 08:52:46 -05:00
parent 5f01d75c2c
commit ca40a3316a
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
4 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
.travis.yml
View File

@ -54,30 +54,30 @@ matrix:
os: osx os: osx
osx_image: xcode10.2 osx_image: xcode10.2
env: MAKE_TARGET=ios PATH="/usr/local/opt/ccache/libexec:$PATH" env: MAKE_TARGET=ios PATH="/usr/local/opt/ccache/libexec:$PATH"
- name: "make windows (macOS)" # - name: "make windows (macOS)"
os: osx # os: osx
osx_image: xcode10.2 # osx_image: xcode10.2
env: MAKE_TARGET=windows PATH="/usr/local/opt/ccache/libexec:$PATH" # env: MAKE_TARGET=windows PATH="/usr/local/opt/ccache/libexec:$PATH"
- name: "make windows-release (macOS)" # - name: "make windows-release (macOS)"
os: osx # os: osx
osx_image: xcode10.2 # osx_image: xcode10.2
env: MAKE_TARGET=windows-release PATH="/usr/local/opt/ccache/libexec:$PATH" # env: MAKE_TARGET=windows-release PATH="/usr/local/opt/ccache/libexec:$PATH"
- name: "make release (macOS beta/clang)" # - name: "make release (macOS beta/clang)"
os: osx # os: osx
osx_image: xcode11 # osx_image: xcode11
env: BUILD_TYPE=Release PATH="/usr/local/opt/ccache/libexec:$PATH" # env: BUILD_TYPE=Release PATH="/usr/local/opt/ccache/libexec:$PATH"
- name: "address sanitizer" # - name: "address sanitizer"
os: osx # os: osx
osx_image: xcode10.2 # osx_image: xcode10.2
env: BUILD_TYPE=Debug XSAN=address PATH="/usr/local/opt/ccache/libexec:$PATH" CC=/usr/local/opt/llvm/bin/clang CXX=/usr/local/opt/llvm/bin/clang++ # env: BUILD_TYPE=Debug XSAN=address PATH="/usr/local/opt/ccache/libexec:$PATH" CC=/usr/local/opt/llvm/bin/clang CXX=/usr/local/opt/llvm/bin/clang++
- name: "thread sanitizer" # - name: "thread sanitizer"
os: osx # os: osx
osx_image: xcode10.2 # osx_image: xcode10.2
env: BUILD_TYPE=Debug XSAN=thread PATH="/usr/local/opt/ccache/libexec:$PATH" CC=/usr/local/opt/llvm/bin/clang CXX=/usr/local/opt/llvm/bin/clang++ # env: BUILD_TYPE=Debug XSAN=thread PATH="/usr/local/opt/ccache/libexec:$PATH" CC=/usr/local/opt/llvm/bin/clang CXX=/usr/local/opt/llvm/bin/clang++
- name: "undefined sanitizer" # - name: "undefined sanitizer"
os: osx # os: osx
osx_image: xcode10.2 # osx_image: xcode10.2
env: BUILD_TYPE=Debug XSAN=undefined PATH="/usr/local/opt/ccache/libexec:$PATH" CC=/usr/local/opt/llvm/bin/clang CXX=/usr/local/opt/llvm/bin/clang++ # env: BUILD_TYPE=Debug XSAN=undefined PATH="/usr/local/opt/ccache/libexec:$PATH" CC=/usr/local/opt/llvm/bin/clang CXX=/usr/local/opt/llvm/bin/clang++
- name: "memory sanitizer" - name: "memory sanitizer"
os: linux os: linux
dist: xenial dist: xenial
@ -99,26 +99,26 @@ matrix:
env: DOCKER_FILE=docker/gcc-trunk.Dockerfile env: DOCKER_FILE=docker/gcc-trunk.Dockerfile
services: docker services: docker
allow_failures: allow_failures:
- name: "native windows debug" # - name: "native windows debug"
os: windows # os: windows
env: BUILD_TYPE=Debug # env: BUILD_TYPE=Debug
- name: "native windows release" # - name: "native windows release"
os: windows # os: windows
env: BUILD_TYPE=Release # env: BUILD_TYPE=Release
- os: linux # - os: linux
dist: xenial # dist: xenial
env: DOCKER_FILE=docker/alpine-windows.Dockerfile # env: DOCKER_FILE=docker/alpine-windows.Dockerfile
services: docker # services: docker
- os: linux - os: linux
dist: xenial dist: xenial
env: DOCKER_FILE=docker/gcc-trunk.Dockerfile env: DOCKER_FILE=docker/gcc-trunk.Dockerfile
services: docker services: docker
- os: osx # - os: osx
osx_image: xcode10.2 # osx_image: xcode10.2
env: MAKE_TARGET=windows PATH="/usr/local/opt/ccache/libexec:$PATH" # env: MAKE_TARGET=windows PATH="/usr/local/opt/ccache/libexec:$PATH"
- os: osx # - os: osx
osx_image: xcode10.2 # osx_image: xcode10.2
env: MAKE_TARGET=windows-release PATH="/usr/local/opt/ccache/libexec:$PATH" # env: MAKE_TARGET=windows-release PATH="/usr/local/opt/ccache/libexec:$PATH"
env: env:
global: global:

2
docker/router.Dockerfile
View File

@ -2,7 +2,7 @@ ARG bootstrap="https://i2p.rocks/i2procks.signed"
FROM alpine:edge as builder FROM alpine:edge as builder
RUN apk update && \ RUN apk update && \
apk add build-base cmake git libcap-dev libcap-static libuv-dev libuv-static curl ninja bash binutils-gold apk add build-base cmake git libcap-dev libcap-static libuv-dev libuv-static curl ninja bash binutils-gold curl-dev
WORKDIR /src/ WORKDIR /src/
COPY . /src/ COPY . /src/

2
llarp/crypto/encrypted_frame.hpp
View File

@ -86,7 +86,7 @@ namespace llarp
{ {
target = frame; target = frame;
worker->addJob( worker->addJob(
[self = this, user = std::move(u)]() { self->Decrypt(user); }); std::bind(&AsyncFrameDecrypter< User >::Decrypt, this, std::move(u)));
} }
}; };
} // namespace llarp } // namespace llarp

7
llarp/rpc/rpc.cpp
View File

@ -200,10 +200,9 @@ namespace llarp
AsyncLokiPing() AsyncLokiPing()
{ {
LogInfo("Pinging Lokid"); LogInfo("Pinging Lokid");
static nlohmann::json::number_unsigned_t major(atoi(LLARP_VERSION_MAJ)); nlohmann::json::number_unsigned_t major(atoi(LLARP_VERSION_MAJ));
static nlohmann::json::number_unsigned_t minor(atoi(LLARP_VERSION_MIN)); nlohmann::json::number_unsigned_t minor(atoi(LLARP_VERSION_MIN));
static nlohmann::json::number_unsigned_t patch( nlohmann::json::number_unsigned_t patch(atoi(LLARP_VERSION_PATCH));
atoi(LLARP_VERSION_PATCH));
nlohmann::json params = { nlohmann::json params = {
{"version", nlohmann::json::array({major, minor, patch})}}; {"version", nlohmann::json::array({major, minor, patch})}};
QueueRPC("lokinet_ping", std::move(params), QueueRPC("lokinet_ping", std::move(params),