Fix ci

Groestlcoin · Sep 3, 2024 · b64f1fb · b64f1fb
1 parent fb94a5c
commit b64f1fb
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 60 deletions.
diff --git a/.github/workflows/groestlcoin.yml b/.github/workflows/groestlcoin.yml
@@ -15,8 +15,7 @@ jobs:
     name: ${{ matrix.name }}
 
     env:
-      MAKEJOBS: "-j4"
-      CHECK_DOC: "0"
+      MAKEJOBS: "4"
       SDK_URL: https://bitcoincore.org/depends-sources/sdks
 
     strategy:
@@ -42,7 +41,7 @@ jobs:
             check-symbols: false
             dep-opts: ""
             config-opts: "LDFLAGS=-static-libstdc++"
-            goal: install
+            goal: build
           - name: linux-64-bit
             host: x86_64-pc-linux-gnu
             os: ubuntu-24.04
@@ -51,7 +50,7 @@ jobs:
             check-symbols: false
             dep-opts: ""
             config-opts: "LDFLAGS=-static-libstdc++"
-            goal: install
+            goal: build
           - name: windows-64-bit
             host: x86_64-w64-mingw32
             arch: "i386"
@@ -65,7 +64,7 @@ jobs:
             check-symbols: false
             dep-opts: ""
             config-opts: "LDFLAGS=-static-libgcc"
-            goal: install
+            goal: build
           - name: macos-64-bit
             host: x86_64-apple-darwin
             os: ubuntu-24.04
@@ -84,7 +83,7 @@ jobs:
             check-symbols: false
             dep-opts: ""
             config-opts: "LDFLAGS=-static-libstdc++"
-            goal: install
+            goal: build
           - name: linux-arm-64-bit
             host: aarch64-linux-gnu
             os: ubuntu-24.04
@@ -93,7 +92,7 @@ jobs:
             check-symbols: false
             dep-opts: ""
             config-opts: "LDFLAGS=-static-libstdc++"
-            goal: install
+            goal: build
           - name: linux-power-64-bit
             host: powerpc64-linux-gnu
             os: ubuntu-24.04
@@ -102,7 +101,7 @@ jobs:
             check-symbols: false
             dep-opts: ""
             config-opts: "LDFLAGS=-static-libstdc++"
-            goal: install
+            goal: build
           - name: linux-power-le-64-bit
             host: powerpc64le-linux-gnu
             os: ubuntu-24.04
@@ -111,7 +110,7 @@ jobs:
             check-symbols: false
             dep-opts: ""
             config-opts: "LDFLAGS=-static-libstdc++"
-            goal: install
+            goal: build
           - name: linux-riscv-64-bit
             host: riscv64-linux-gnu
             os: ubuntu-24.04
@@ -120,7 +119,7 @@ jobs:
             check-symbols: false
             dep-opts: ""
             config-opts: "LDFLAGS=-static-libstdc++"
-            goal: install
+            goal: build
           - name: linux-s390x
             host: s390x-linux-gnu
             os: ubuntu-24.04
@@ -129,7 +128,7 @@ jobs:
             check-symbols: false
             dep-opts: ""
             config-opts: "LDFLAGS=-static-libstdc++"
-            goal: install
+            goal: build
 
     runs-on: ${{ matrix.os }}
 
@@ -183,16 +182,15 @@ jobs:
 
       - name: Build Groestlcoin
         run: |
-          cmake -B build --toolchain `pwd`/depends/${{ matrix.host }}/toolchain.cmake
-          make $MAKEJOBS ${{ matrix.goal }} || ( echo "Build failure. Verbose build follows." && make ${{ matrix.goal }} V=1 ; false )
+          cmake -j $MAKEJOBS --install ${{ matrix.goal }} --toolchain `pwd`/depends/${{ matrix.host }}/toolchain.cmake -DREDUCE_EXPORTS=ON || ( echo "Build failure. Verbose build follows." && cmake -j $MAKEJOBS --install ${{ matrix.goal }} --toolchain `pwd`/depends/${{ matrix.host }}/toolchain.cmake -DREDUCE_EXPORTS=ON --verbose ; false )
 
       - name: Check security
         if: ${{ matrix.check-security }}
-        run: make -C src check-security
+        run: cmake --build build --target check-security
 
       - name: Check symbols
         if: ${{ matrix.check-symbols }}
-        run: make -C src check-symbols
+        run: cmake --build build --target check-symbols
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -101,7 +101,7 @@ if(WITH_ZMQ)
 endif()
 
 # Home for common functionality shared by different executables and libraries.
-# Similar to `bitcoin_util` library, but higher-level.
+# Similar to `groestlcoin_util` library, but higher-level.
 add_library(bitcoin_common STATIC EXCLUDE_FROM_ALL
   addresstype.cpp
   base58.cpp
@@ -125,6 +125,7 @@ add_library(bitcoin_common STATIC EXCLUDE_FROM_ALL
   core_write.cpp
   deploymentinfo.cpp
   external_signer.cpp
+  groestlcoin.cpp
   init/common.cpp
   kernel/chainparams.cpp
   key.cpp
@@ -169,25 +170,25 @@ if(ENABLE_WALLET)
   add_subdirectory(wallet)
 
   if(BUILD_WALLET_TOOL)
-    add_executable(bitcoin-wallet
-      bitcoin-wallet.cpp
-      init/bitcoin-wallet.cpp
+    add_executable(groestlcoin-wallet
+      groestlcoin-wallet.cpp
+      init/groestlcoin-wallet.cpp
       wallet/wallettool.cpp
     )
-    add_windows_resources(bitcoin-wallet bitcoin-wallet-res.rc)
-    target_link_libraries(bitcoin-wallet
+    add_windows_resources(groestlcoin-wallet groestlcoin-wallet-res.rc)
+    target_link_libraries(groestlcoin-wallet
       core_interface
       bitcoin_wallet
       bitcoin_common
       bitcoin_util
       Boost::headers
     )
-    list(APPEND installable_targets bitcoin-wallet)
+    list(APPEND installable_targets groestlcoin-wallet)
   endif()
 endif()
 
 
-# P2P and RPC server functionality used by `bitcoind` and `bitcoin-qt` executables.
+# P2P and RPC server functionality used by `groestlcoind` and `groestlcoin-qt` executables.
 add_library(bitcoin_node STATIC EXCLUDE_FROM_ALL
   addrdb.cpp
   addrman.cpp
@@ -200,6 +201,7 @@ add_library(bitcoin_node STATIC EXCLUDE_FROM_ALL
   dbwrapper.cpp
   deploymentstatus.cpp
   flatfile.cpp
+  groestlcoin.cpp
   headerssync.cpp
   httprpc.cpp
   httpserver.cpp
@@ -300,32 +302,32 @@ target_link_libraries(bitcoin_node
 )
 
 
-# Bitcoin Core bitcoind.
+# Groestlcoin Core groestlcoind.
 if(BUILD_DAEMON)
-  add_executable(bitcoind
-    bitcoind.cpp
-    init/bitcoind.cpp
+  add_executable(groestlcoind
+    groestlcoind.cpp
+    init/groestlcoind.cpp
   )
-  add_windows_resources(bitcoind bitcoind-res.rc)
-  target_link_libraries(bitcoind
+  add_windows_resources(groestlcoind groestlcoind-res.rc)
+  target_link_libraries(groestlcoind
     core_interface
     bitcoin_node
     $<TARGET_NAME_IF_EXISTS:bitcoin_wallet>
   )
-  list(APPEND installable_targets bitcoind)
+  list(APPEND installable_targets groestlcoind)
 endif()
 if(WITH_MULTIPROCESS)
-  add_executable(bitcoin-node
-    bitcoind.cpp
-    init/bitcoin-node.cpp
+  add_executable(groestlcoin-node
+    groestlcoind.cpp
+    init/groestlcoin-node.cpp
   )
-  target_link_libraries(bitcoin-node
+  target_link_libraries(groestlcoin-node
     core_interface
     bitcoin_node
     bitcoin_ipc
     $<TARGET_NAME_IF_EXISTS:bitcoin_wallet>
   )
-  list(APPEND installable_targets bitcoin-node)
+  list(APPEND installable_targets groestlcoin-node)
 endif()
 
 
@@ -340,43 +342,43 @@ target_link_libraries(bitcoin_cli
 )
 
 
-# Bitcoin Core RPC client
+# Groestlcoin Core RPC client
 if(BUILD_CLI)
-  add_executable(bitcoin-cli bitcoin-cli.cpp)
-  add_windows_resources(bitcoin-cli bitcoin-cli-res.rc)
-  target_link_libraries(bitcoin-cli
+  add_executable(groestlcoin-cli groestlcoin-cli.cpp)
+  add_windows_resources(groestlcoin-cli groestlcoin-cli-res.rc)
+  target_link_libraries(groestlcoin-cli
     core_interface
     bitcoin_cli
     bitcoin_common
     bitcoin_util
     $<TARGET_NAME_IF_EXISTS:libevent::libevent>
   )
-  list(APPEND installable_targets bitcoin-cli)
+  list(APPEND installable_targets groestlcoin-cli)
 endif()
 
 
 if(BUILD_TX)
-  add_executable(bitcoin-tx bitcoin-tx.cpp)
-  add_windows_resources(bitcoin-tx bitcoin-tx-res.rc)
-  target_link_libraries(bitcoin-tx
+  add_executable(groestlcoin-tx groestlcoin-tx.cpp)
+  add_windows_resources(groestlcoin-tx groestlcoin-tx-res.rc)
+  target_link_libraries(groestlcoin-tx
     core_interface
     bitcoin_common
     bitcoin_util
     univalue
   )
-  list(APPEND installable_targets bitcoin-tx)
+  list(APPEND installable_targets groestlcoin-tx)
 endif()
 
 
 if(BUILD_UTIL)
-  add_executable(bitcoin-util bitcoin-util.cpp)
-  add_windows_resources(bitcoin-util bitcoin-util-res.rc)
-  target_link_libraries(bitcoin-util
+  add_executable(groestlcoin-util groestlcoin-util.cpp)
+  add_windows_resources(groestlcoin-util groestlcoin-util-res.rc)
+  target_link_libraries(groestlcoin-util
     core_interface
     bitcoin_common
     bitcoin_util
   )
-  list(APPEND installable_targets bitcoin-util)
+  list(APPEND installable_targets groestlcoin-util)
 endif()
 
 
@@ -390,22 +392,22 @@ if(BUILD_KERNEL_LIB)
 endif()
 
 if(BUILD_UTIL_CHAINSTATE)
-  add_executable(bitcoin-chainstate
-    bitcoin-chainstate.cpp
+  add_executable(groestlcoin-chainstate
+    groestlcoin-chainstate.cpp
   )
   # TODO: The `SKIP_BUILD_RPATH` property setting can be deleted
   #       in the future after reordering Guix script commands to
   #       perform binary checks after the installation step.
   # Relevant discussions:
   # - https://github.com/hebasto/bitcoin/pull/236#issuecomment-2183120953
   # - https://github.com/bitcoin/bitcoin/pull/30312#issuecomment-2191235833
-  set_target_properties(bitcoin-chainstate PROPERTIES
+  set_target_properties(groestlcoin-chainstate PROPERTIES
     SKIP_BUILD_RPATH OFF
   )
-  target_link_libraries(bitcoin-chainstate
+  target_link_libraries(groestlcoin-chainstate
     PRIVATE
       core_interface
-      bitcoinkernel
+      groestlcoinkernel
   )
 endif()
 

diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
@@ -2,12 +2,12 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://opensource.org/license/mit/.
 
-# TODO: libbitcoinkernel is a work in progress consensus engine
+# TODO: libgroestlcoinkernel is a work in progress consensus engine
 #       library, as more and more modules are decoupled from the
 #       consensus engine, this list will shrink to only those
 #       which are absolutely necessary.
-add_library(bitcoinkernel
-  bitcoinkernel.cpp
+add_library(groestlcoinkernel
+  groestlcoinkernel.cpp
   chain.cpp
   checks.cpp
   chainparams.cpp
@@ -77,7 +77,7 @@ add_library(bitcoinkernel
   ../validationinterface.cpp
   ../versionbits.cpp
 )
-target_link_libraries(bitcoinkernel
+target_link_libraries(groestlcoinkernel
   PRIVATE
     core_interface
     bitcoin_clientversion
@@ -88,18 +88,18 @@ target_link_libraries(bitcoinkernel
     Boost::headers
 )
 
-# libbitcoinkernel requires default symbol visibility, explicitly
+# libgroestlcoinkernel requires default symbol visibility, explicitly
 # specify that here so that things still work even when user
 # configures with -DREDUCE_EXPORTS=ON
 #
 # Note this is a quick hack that will be removed as we
 # incrementally define what to export from the library.
-set_target_properties(bitcoinkernel PROPERTIES
+set_target_properties(groestlcoinkernel PROPERTIES
   CXX_VISIBILITY_PRESET default
 )
 
 include(GNUInstallDirs)
-install(TARGETS bitcoinkernel
+install(TARGETS groestlcoinkernel
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}