Skip to content

Commit

Permalink
Merge pull request #1800 from oxen-io/dev
Browse files Browse the repository at this point in the history
v0.9.8
  • Loading branch information
majestrate committed Nov 16, 2021
2 parents 7792c9b + d24f891 commit ad201a4
Show file tree
Hide file tree
Showing 86 changed files with 870 additions and 1,436 deletions.
4 changes: 2 additions & 2 deletions .drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ local mac_builder(name,
'-DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 ' +
'-DCMAKE_CXX_FLAGS="-march=x86-64 -mtune=haswell" ' +
'-DCMAKE_C_FLAGS="-march=x86-64 -mtune=haswell" ' +
'-DNATIVE_BUILD=OFF -DWITH_SYSTEMD=OFF',
'-DNATIVE_BUILD=OFF -DWITH_SYSTEMD=OFF -DWITH_BOOTSTRAP=OFF',
extra_cmds=[
'../contrib/ci/drone-check-static-libs.sh',
'../contrib/ci/drone-static-upload.sh',
Expand All @@ -317,7 +317,7 @@ local mac_builder(name,
deps=['g++', 'python3-dev', 'automake', 'libtool'],
cmake_extra='-DBUILD_STATIC_DEPS=ON -DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON ' +
'-DCMAKE_CXX_FLAGS="-march=armv7-a+fp -Wno-psabi" -DCMAKE_C_FLAGS="-march=armv7-a+fp" ' +
'-DNATIVE_BUILD=OFF -DWITH_SYSTEMD=OFF',
'-DNATIVE_BUILD=OFF -DWITH_SYSTEMD=OFF -DWITH_BOOTSTRAP=OFF',
extra_cmds=[
'../contrib/ci/drone-check-static-libs.sh',
'UPLOAD_OS=linux-armhf ../contrib/ci/drone-static-upload.sh',
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ endif()


project(lokinet
VERSION 0.9.7
VERSION 0.9.8
DESCRIPTION "lokinet - IP packet onion router"
LANGUAGES ${LANGS})

Expand Down
4 changes: 2 additions & 2 deletions cmake/StaticBuild.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ set(EXPAT_SOURCE expat-${EXPAT_VERSION}.tar.xz)
set(EXPAT_HASH SHA512=dde8a9a094b18d795a0e86ca4aa68488b352dc67019e0d669e8b910ed149628de4c2a49bc3a5b832f624319336a01f9e4debe03433a43e1c420f36356d886820
CACHE STRING "expat source hash")

set(UNBOUND_VERSION 1.13.1 CACHE STRING "unbound version")
set(UNBOUND_VERSION 1.13.2 CACHE STRING "unbound version")
set(UNBOUND_MIRROR ${LOCAL_MIRROR} https://nlnetlabs.nl/downloads/unbound CACHE STRING "unbound download mirror(s)")
set(UNBOUND_SOURCE unbound-${UNBOUND_VERSION}.tar.gz)
set(UNBOUND_HASH SHA256=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
set(UNBOUND_HASH SHA256=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
CACHE STRING "unbound source hash")

set(SQLITE3_VERSION 3350500 CACHE STRING "sqlite3 version")
Expand Down
6 changes: 0 additions & 6 deletions contrib/ci/docker/00-debian-bullseye-base.dockerfile

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/ci/docker/00-debian-buster-base.dockerfile

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/ci/docker/00-debian-sid-base.dockerfile

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/ci/docker/00-debian-stable-base.dockerfile

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/ci/docker/00-debian-testing-base.dockerfile

This file was deleted.

39 changes: 0 additions & 39 deletions contrib/ci/docker/10-debian-bullseye.dockerfile

This file was deleted.

40 changes: 0 additions & 40 deletions contrib/ci/docker/10-debian-buster.dockerfile

This file was deleted.

39 changes: 0 additions & 39 deletions contrib/ci/docker/10-debian-sid.dockerfile

This file was deleted.

39 changes: 0 additions & 39 deletions contrib/ci/docker/10-debian-stable.dockerfile

This file was deleted.

31 changes: 0 additions & 31 deletions contrib/ci/docker/10-ubuntu-bionic.dockerfile

This file was deleted.

42 changes: 0 additions & 42 deletions contrib/ci/docker/10-ubuntu-focal.dockerfile

This file was deleted.

42 changes: 0 additions & 42 deletions contrib/ci/docker/10-ubuntu-impish.dockerfile

This file was deleted.

42 changes: 0 additions & 42 deletions contrib/ci/docker/10-ubuntu-lts.dockerfile

This file was deleted.

Loading

0 comments on commit ad201a4

Please sign in to comment.