mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-15 12:13:24 +00:00
more travis fixes
This commit is contained in:
Jeff Becker
parent
5f01d75c2c
commit
ca40a3316a
80
.travis.yml
80
.travis.yml
@ -54,30 +54,30 @@ matrix:
|
||||
os: osx
|
||||
osx_image: xcode10.2
|
||||
env: MAKE_TARGET=ios PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
- name: "make windows (macOS)"
|
||||
os: osx
|
||||
osx_image: xcode10.2
|
||||
env: MAKE_TARGET=windows PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
- name: "make windows-release (macOS)"
|
||||
os: osx
|
||||
osx_image: xcode10.2
|
||||
env: MAKE_TARGET=windows-release PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
- name: "make release (macOS beta/clang)"
|
||||
os: osx
|
||||
osx_image: xcode11
|
||||
env: BUILD_TYPE=Release PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
- name: "address sanitizer"
|
||||
os: osx
|
||||
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++
|
||||
- name: "thread sanitizer"
|
||||
os: osx
|
||||
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++
|
||||
- name: "undefined sanitizer"
|
||||
os: osx
|
||||
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++
|
||||
# - name: "make windows (macOS)"
|
||||
# os: osx
|
||||
# osx_image: xcode10.2
|
||||
# env: MAKE_TARGET=windows PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
# - name: "make windows-release (macOS)"
|
||||
# os: osx
|
||||
# osx_image: xcode10.2
|
||||
# env: MAKE_TARGET=windows-release PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
# - name: "make release (macOS beta/clang)"
|
||||
# os: osx
|
||||
# osx_image: xcode11
|
||||
# env: BUILD_TYPE=Release PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
# - name: "address sanitizer"
|
||||
# os: osx
|
||||
# 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++
|
||||
# - name: "thread sanitizer"
|
||||
# os: osx
|
||||
# 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++
|
||||
# - name: "undefined sanitizer"
|
||||
# os: osx
|
||||
# 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++
|
||||
- name: "memory sanitizer"
|
||||
os: linux
|
||||
dist: xenial
|
||||
@ -99,26 +99,26 @@ matrix:
|
||||
env: DOCKER_FILE=docker/gcc-trunk.Dockerfile
|
||||
services: docker
|
||||
allow_failures:
|
||||
- name: "native windows debug"
|
||||
os: windows
|
||||
env: BUILD_TYPE=Debug
|
||||
- name: "native windows release"
|
||||
os: windows
|
||||
env: BUILD_TYPE=Release
|
||||
- os: linux
|
||||
dist: xenial
|
||||
env: DOCKER_FILE=docker/alpine-windows.Dockerfile
|
||||
services: docker
|
||||
# - name: "native windows debug"
|
||||
# os: windows
|
||||
# env: BUILD_TYPE=Debug
|
||||
# - name: "native windows release"
|
||||
# os: windows
|
||||
# env: BUILD_TYPE=Release
|
||||
# - os: linux
|
||||
# dist: xenial
|
||||
# env: DOCKER_FILE=docker/alpine-windows.Dockerfile
|
||||
# services: docker
|
||||
- os: linux
|
||||
dist: xenial
|
||||
env: DOCKER_FILE=docker/gcc-trunk.Dockerfile
|
||||
services: docker
|
||||
- os: osx
|
||||
osx_image: xcode10.2
|
||||
env: MAKE_TARGET=windows PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
- os: osx
|
||||
osx_image: xcode10.2
|
||||
env: MAKE_TARGET=windows-release PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
# - os: osx
|
||||
# osx_image: xcode10.2
|
||||
# env: MAKE_TARGET=windows PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
# - os: osx
|
||||
# osx_image: xcode10.2
|
||||
# env: MAKE_TARGET=windows-release PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||
|
||||
env:
|
||||
global:
|
||||
|
||||
@ -2,7 +2,7 @@ ARG bootstrap="https://i2p.rocks/i2procks.signed"
|
||||
FROM alpine:edge as builder
|
||||
|
||||
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/
|
||||
COPY . /src/
|
||||
|
||||
@ -86,7 +86,7 @@ namespace llarp
|
||||
{
|
||||
target = frame;
|
||||
worker->addJob(
|
||||
[self = this, user = std::move(u)]() { self->Decrypt(user); });
|
||||
std::bind(&AsyncFrameDecrypter< User >::Decrypt, this, std::move(u)));
|
||||
}
|
||||
};
|
||||
} // namespace llarp
|
||||
|
||||
@ -200,10 +200,9 @@ namespace llarp
|
||||
AsyncLokiPing()
|
||||
{
|
||||
LogInfo("Pinging Lokid");
|
||||
static nlohmann::json::number_unsigned_t major(atoi(LLARP_VERSION_MAJ));
|
||||
static nlohmann::json::number_unsigned_t minor(atoi(LLARP_VERSION_MIN));
|
||||
static nlohmann::json::number_unsigned_t patch(
|
||||
atoi(LLARP_VERSION_PATCH));
|
||||
nlohmann::json::number_unsigned_t major(atoi(LLARP_VERSION_MAJ));
|
||||
nlohmann::json::number_unsigned_t minor(atoi(LLARP_VERSION_MIN));
|
||||
nlohmann::json::number_unsigned_t patch(atoi(LLARP_VERSION_PATCH));
|
||||
nlohmann::json params = {
|
||||
{"version", nlohmann::json::array({major, minor, patch})}};
|
||||
QueueRPC("lokinet_ping", std::move(params),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user