Merge pull request #246 from VanGrx/master

Github Actions changes
safex · Dec 13, 2020 · 26d9576 · 26d9576
2 parents 29b5f79 + b4f5e72
commit 26d9576
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 55 deletions.
diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml
@@ -16,11 +16,19 @@ jobs:
     - name: update brew
       run:  brew tap jmuncaster/homebrew-header-only
     - name: install packages
-      run:  brew install autogen autoconf automake binutils coreutils cmake boost ldns expat xz doxygen hidapi graphviz libpgm libunwind-headers unbound zmq czmq jmuncaster/header-only/cppzmq zeromq libsodium miniupnpc openssl pkg-config protobuf readline
+      run:  brew install autogen autoconf automake binutils coreutils cmake ldns expat xz doxygen hidapi graphviz libpgm libunwind-headers unbound zmq czmq jmuncaster/header-only/cppzmq zeromq libsodium miniupnpc openssl pkg-config protobuf readline
+    - name: install boost
+      run:  |
+          curl -OL https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz
+          tar -xf boost_1_72_0.tar.gz
+          cd boost_1_72_0
+          ./bootstrap.sh
+          ./b2 headers
+          sudo ./b2 cxxflags=-fPIC cflags=-fPIC -a link=static threading=multi threadapi=pthread install
     - name: install protobuf
       run: |
         cd external
         sudo chmod +x install_protobuf_dep_macos.sh
         sudo ./install_protobuf_dep_macos.sh
     - name: build
-      run: make release-static-mac-x86_64-proto
+      run: make release-static-mac-x86_64
diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml
@@ -16,7 +16,15 @@ jobs:
     - name: update brew
       run:  brew tap jmuncaster/homebrew-header-only
     - name: install packages
-      run:  brew install autogen autoconf automake binutils coreutils cmake boost ldns expat xz doxygen hidapi graphviz libpgm libunwind-headers unbound zmq czmq jmuncaster/header-only/cppzmq zeromq libsodium miniupnpc openssl pkg-config protobuf readline
+      run:  brew install autogen autoconf automake binutils coreutils cmake ldns expat xz doxygen hidapi graphviz libpgm libunwind-headers unbound zmq czmq jmuncaster/header-only/cppzmq zeromq libsodium miniupnpc openssl pkg-config protobuf readline
+    - name: install boost
+      run:  |
+          curl -OL https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz
+          tar -xf boost_1_72_0.tar.gz
+          cd boost_1_72_0
+          ./bootstrap.sh
+          ./b2 headers
+          sudo ./b2 cxxflags=-fPIC cflags=-fPIC -a link=static threading=multi threadapi=pthread install
     - name: install protobuf
       run: |
         cd external

diff --git a/.github/workflows/ubuntu-release.yml b/.github/workflows/ubuntu-release.yml
@@ -14,14 +14,26 @@ jobs:
     - name: submodules-init
       uses: snickerbockers/submodules-init@v4
     - name: remove zmq
-      run:  sudo apt remove --purge --auto-remove libzmq5 libnorm1 libboost* cmake*
+      run:  sudo apt-get remove --purge --auto-remove libzmq5 libnorm1 libboost* cmake* build-essential*
     - name: remove boost
       run: sudo rm -rf /usr/local/share/boost
     - name: cleanup
       run:  sudo apt-get clean; sudo apt-get autoclean
     - name: install zmq
-      run:  sudo apt install libnorm1=1.5r6+dfsg1-6 libzmq5=4.2.5-1ubuntu0.2
+      run:  sudo apt-get install libnorm1=1.5r6+dfsg1-6 libzmq5=4.2.5-1ubuntu0.2
     - name: install dependecies
-      run:  sudo apt install build-essential cmake pkg-config libboost-all-dev=1.65.1.0ubuntu1 libssl-dev libsodium23=1.0.16-2 libsodium-dev=1.0.16-2 libpgm-dev=5.2.122~dfsg-2 libzmq3-dev=4.2.5-1ubuntu0.2 libunbound-dev libminiupnpc-dev libunwind8-dev liblzma-dev libreadline6-dev libldns-dev libexpat1-dev libgtest-dev doxygen graphviz libpcsclite-dev libprotobuf-dev libnorm-dev=1.5r6+dfsg1-6 libpcsclite1
+      run:  sudo apt-get install build-essential=12.4ubuntu1 cmake=3.10.2-1ubuntu2.18.04.1 pkg-config=0.29.1-0ubuntu2 libboost-all-dev=1.65.1.0ubuntu1 libssl-dev libsodium23=1.0.16-2 libsodium-dev=1.0.16-2 libpgm-dev=5.2.122~dfsg-2 libzmq3-dev=4.2.5-1ubuntu0.2 libunbound-dev libminiupnpc-dev libunwind8-dev liblzma-dev libreadline6-dev libldns-dev libexpat1-dev libgtest-dev doxygen graphviz libpcsclite-dev libnorm-dev=1.5r6+dfsg1-6 libpcsclite1
+    - name: Build protobuf library
+      run: |
+            git clone https://github.com/protocolbuffers/protobuf.git
+            cd protobuf
+            git submodule update --init --recursive
+            ./autogen.sh
+            ./configure
+            make
+            sudo make install
+            sudo ldconfig
+    - name: proto_ver
+      run:  protoc --version
     - name: build
-      run:  make dist-static-proto
+      run:  make release-static
diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml
@@ -7,23 +7,39 @@ on:
 jobs:
   build:
 
-    runs-on: windows-latest
+    runs-on: ubuntu-18.04
 
     steps:
-    - uses: numworks/setup-msys2@v1
-      with:
-        msystem: MINGW64
-        path-type: inherit
     - uses: actions/checkout@v1
     - name: submodules-init
       uses: snickerbockers/submodules-init@v4
-    - name: update system
-      run:  msys2do pacman -Syuu --noconfirm
-    - name: update system again
-      run:  msys2do pacman -Syuu --noconfirm
-    - name: update packages
-      run:  msys2do pacman -S git base-devel mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-protobuf mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium --noconfirm
-    - name: install protobuf
-      run:  cd external; msys2do ./install_protobuf_dep_mingw.sh --noconfirm
+    - name: remove zmq
+      run:  sudo apt-get remove --purge --auto-remove libzmq5 libnorm1 libboost* cmake* build-essential*
+    - name: remove boost
+      run: sudo rm -rf /usr/local/share/boost
+    - name: cleanup
+      run:  sudo apt-get clean; sudo apt-get autoclean
+    - name: install zmq
+      run:  sudo apt-get install libnorm1=1.5r6+dfsg1-6 libzmq5=4.2.5-1ubuntu0.2
+    - name: install dependecies
+      run:  sudo apt-get install build-essential=12.4ubuntu1 cmake=3.10.2-1ubuntu2.18.04.1 pkg-config=0.29.1-0ubuntu2 libboost-all-dev=1.65.1.0ubuntu1 libssl-dev libsodium23=1.0.16-2 libsodium-dev=1.0.16-2 libpgm-dev=5.2.122~dfsg-2 libzmq3-dev=4.2.5-1ubuntu0.2 libunbound-dev libminiupnpc-dev libunwind8-dev liblzma-dev libreadline6-dev libldns-dev libexpat1-dev libgtest-dev doxygen graphviz libpcsclite-dev libnorm-dev=1.5r6+dfsg1-6 libpcsclite1
+    - name: install win build dependencies
+      run: sudo apt-get install python3 g++-mingw-w64-x86-64 wine1.6 bc
+    - name: setup mingw gcc 
+      run:  sudo update-alternatives --set x86_64-w64-mingw32-gcc  /usr/bin/x86_64-w64-mingw32-gcc-posix
+    - name: setup mingw g++
+      run:  sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
+    - name: Build protobuf library
+      run: |
+            git clone https://github.com/protocolbuffers/protobuf.git
+            cd protobuf
+            git submodule update --init --recursive
+            ./autogen.sh
+            ./configure
+            make
+            sudo make install
+            sudo ldconfig
+    - name: proto_ver
+      run:  protoc --version
     - name: build
-      run: msys2do make release-static-win64-proto-github
+      run:  make depends target=x86_64-w64-mingw32
diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml
diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@ Network has performed hard fork 6 with Fix for token overflow issue, Wallet fix
 
 Build | Test 
 ------|------
-![](https://github.com/VanGrx/safexcore/workflows/Ubuntu%2018.04%20Build/badge.svg?branch=master) | ![](https://github.com/VanGrx/safexcore/workflows/Ubuntu%2018.04%20Test/badge.svg?branch=master)
-![](https://github.com/VanGrx/safexcore/workflows/Mac%20Build/badge.svg?branch=master) | ![](https://github.com/VanGrx/safexcore/workflows/Mac%20Test/badge.svg?branch=master)
-![](https://github.com/VanGrx/safexcore/workflows/Windows%20Build/badge.svg?branch=master) | ![](https://github.com/VanGrx/safexcore/workflows/Windows%20Test/badge.svg?branch=master)
+![](https://github.com/safex/safexcore/workflows/Ubuntu%2018.04%20Build/badge.svg?branch=master) | ![](https://github.com/safex/safexcore/workflows/Ubuntu%2018.04%20Test/badge.svg?branch=master)
+![](https://github.com/safex/safexcore/workflows/Mac%20Build/badge.svg?branch=master) | ![](https://github.com/safex/safexcore/workflows/Mac%20Test/badge.svg?branch=master)
+![](https://github.com/safex/safexcore/workflows/Windows%20Build/badge.svg?branch=master) | 
 
 ## Build Instructions
 

diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt
@@ -37,8 +37,8 @@ if(BUILD_SAFEX_PROTOBUF_RPC)
 
     FOREACH(proto ${DATAMODEL_PROTOS})
       FILE(TO_NATIVE_PATH ${proto} proto_native)
-      EXECUTE_PROCESS(COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --proto_path=${PROTOMODEL_PATH} --cpp_out=${PROTOBINDING_PATH} ${proto_native}
-      RESULT_VARIABLE rv)
+      EXECUTE_PROCESS(COMMAND ${Protobuf_PROTOC_EXECUTABLE} -I "${PROTOMODEL_PATH}" -I "${Protobuf_INCLUDE_DIR}" --cpp_out=${PROTOBINDING_PATH} ${proto_native}
+      RESULT_VARIABLE RET OUTPUT_VARIABLE OUT ERROR_VARIABLE ERR)
       # Optional, but that can show the user if something have gone wrong with the proto generation 
       IF(${rv})
            MESSAGE("Generation of data model returned ${rv} for proto ${proto_native}")