Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch libdeficonsensus to internal, toolchain cleanups #1860

Merged
merged 3 commits into from
Apr 5, 2023
Merged

Switch libdeficonsensus to internal, toolchain cleanups #1860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
162ae41
Cleanup deps
prasannavl Apr 5, 2023
7ac3935
Switch libdeficonsensus to an internal lib
prasannavl Apr 5, 2023
aacebef
Update ubuntu bases
prasannavl Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v3

Expand All @@ -75,7 +75,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v3

Expand All @@ -92,7 +92,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v3

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
tags: latest,${{ env.BUILD_VERSION }}

windows:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/')

steps:
Expand All @@ -63,7 +63,7 @@ jobs:
path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.tar.gz

macos:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/')

steps:
Expand All @@ -83,7 +83,7 @@ jobs:
- linux
- windows
- macos
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/')

steps:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:
fetch-depth: 0

- name: Build Node
# TODO: Switch this to a docker build later and this builds on the native
# VM toolchain and loses disparity with the CI release builds
run: TARGET="x86_64-pc-linux-gnu" ./make.sh build

- name: Upload Binaries
Expand Down
15 changes: 0 additions & 15 deletions depends/packages/native_biplist.mk
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions depends/packages/native_ds_store.mk
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions depends/packages/native_mac_alias.mk
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions depends/packages/packages.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ zmq_packages=zeromq

upnp_packages=miniupnpc

darwin_native_packages = native_biplist native_ds_store native_mac_alias

darwin_native_packages =
ifneq ($(build_os),darwin)
darwin_native_packages += native_cctools
endif
4 changes: 1 addition & 3 deletions make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ setup_vars() {
DOCKERFILE=${DOCKERFILE:-""}
DOCKERFILES_DIR=${DOCKERFILES_DIR:-"./contrib/dockerfiles"}
RELEASE_DIR=${RELEASE_DIR:-"./build"}
CLANG_DEFAULT_VERSION=${CLANG_DEFAULT_VERSION:-"16"}

CLANG_DEFAULT_VERSION=${CLANG_DEFAULT_VERSION:-"16"}
MAKE_DEBUG=${MAKE_DEBUG:-"0"}

Expand Down Expand Up @@ -401,7 +399,7 @@ pkg_install_deps() {

pkg_install_deps_mingw_x86_64() {
apt install -y \
g++-mingw-w64-x86-64 mingw-w64-x86-64-dev nsis
g++-mingw-w64-x86-64 mingw-w64-x86-64-dev
}

pkg_install_deps_armhf() {
Expand Down
3 changes: 2 additions & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ EXTRA_LIBRARIES += \
$(LIBDEFI_WALLET) \
$(LIBDEFI_ZMQ)

lib_LIBRARIES = $(LIBDEFI_CONSENSUS)
lib_LIBRARIES =
lib_LTLIBRARIES =

bin_PROGRAMS =
Expand Down Expand Up @@ -451,6 +451,7 @@ endif
if !ENABLE_WALLET
libdefi_server_a_SOURCES += dummywallet.cpp
endif
libdefi_server_a_LIBADD = $(LIBDEFI_CONSENSUS)

if ENABLE_ZMQ
libdefi_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) $(ZMQ_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion src/amount.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ struct CTokenAmount { // simple std::pair is less informative
// add
auto sumRes = SafeAdd(nValue, amount);
if (!sumRes) {
return sumRes;
return std::move(sumRes);
}

nValue = *sumRes;
Expand Down