Skip to content

Commit

Permalink
Check if wallet is enabled and add wallet inclusion (#997)
Browse files Browse the repository at this point in the history
* Check if wallet is enabled and add wallet inclusion

* Add new test cases for the wallet tests

* Add ubuntu repo updates for github workflows

* Disable bdb compiling for no wallet
  • Loading branch information
marpme authored Nov 7, 2019
1 parent 88b7f27 commit de9545a
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 22 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/build-test-ubuntu-no-wallet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: '[NO WALLET] Ubuntu 18.04.'

on: [push]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1

- name: Update apt repos
run: sudo apt-get update

- name: Install base dependencies
run: sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake cmake curl g++-multilib binutils-gold python3

- name: Build depends
run: cd depends/ && make -j4 HOST=x86_64-linux-gnu NO_WALLET=0

- name: Auto generate
run: ./autogen.sh

- name: configure
run: ./configure --disable-wallet --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib

- name: make
run: make -j4

- name: make check
run: make check -j4
46 changes: 24 additions & 22 deletions .github/workflows/build-test-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
name: Build and Test on Ubuntu
name: '[FULL] Ubuntu 18.04.'

on: [push]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1

- name: Install base dependencies
run: sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake cmake curl g++-multilib binutils-gold python3

- name: Build depends
run: cd depends/ && make -j4 HOST=x86_64-linux-gnu

- name: Auto generate
run: ./autogen.sh

- name: configure
run: ./configure --disable-bench --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib

- name: make
run: make -j4

- name: make check
run: make check -j4
- uses: actions/checkout@v1

- name: Update apt repos
run: sudo apt-get update

- name: Install base dependencies
run: sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake cmake curl g++-multilib binutils-gold python3

- name: Build depends
run: cd depends/ && make -j4 HOST=x86_64-linux-gnu

- name: Auto generate
run: ./autogen.sh

- name: configure
run: ./configure --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib

- name: make
run: make -j4

- name: make check
run: make check -j4
4 changes: 4 additions & 0 deletions src/rpc/mining.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
#include <consensus/consensus.h>
#include <consensus/params.h>
#include <consensus/validation.h>

#ifdef ENABLE_WALLET
#include <wallet/wallet.h>
#endif

#include <core_io.h>
#include <validation.h>
#include <key_io.h>
Expand Down

0 comments on commit de9545a

Please sign in to comment.