From 202efa0f19ca6194958b7b8d57c4b347a4c4f5ed Mon Sep 17 00:00:00 2001 From: Dynex Date: Mon, 4 Dec 2023 12:19:43 +0100 Subject: [PATCH] CI updates --- .github/workflows/ci.yml | 3 +-- CMakeLists.txt | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5aef2200..736554b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: rm -rf build mkdir build; cd build; - cmake -DGUI=True -DCMAKE_CXX_FLAGS=-march=${{ matrix.arch }} -mtune=generic -DCMAKE_C_FLAGS=-march=${{ matrix.arch }} -mtune=generic ..; + cmake -DCMAKE_CXX_FLAGS=-march=${{ matrix.arch }} -mtune=generic -DCMAKE_C_FLAGS=-march=${{ matrix.arch }} -mtune=generic ..; make -j2; ) - name: create artifacts @@ -56,7 +56,6 @@ jobs: mv ./build/src/dynexd ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/dynexd mv ./build/src/simplewallet ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/simplewallet mv ./build/src/walletd ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/walletd - mv ./build/src/WalletGui/dynexwallet ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/dynexwallet mv ./release Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }} - name: Archive artifacts on GH if: success() diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b138949..37efa2cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,15 +127,15 @@ else() endif() endif() -# CURL is requred: +# CURL is required: FIND_PACKAGE(CURL REQUIRED) IF(CURL_FOUND) INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) - if(APPLE) - INCLUDE_DIRECTORIES("/usr/local/homebrew/cellar/curl/7.85.0/include") - SET(CURL_LIBRARIES "-L /usr/local/homebrew/cellar/curl/7.85.0/lib -L /usr/local/homebrew/cellar/curl/7.85.0/include" ) - MESSAGE(INFO " Apple M1 curl path set to x86_64 versions /usr/local/homebrew/cellar/curl/7.85.0/") - endif() + #if(APPLE) + # INCLUDE_DIRECTORIES("/usr/local/homebrew/cellar/curl/7.85.0/include") + # SET(CURL_LIBRARIES "-L /usr/local/homebrew/cellar/curl/7.85.0/lib -L /usr/local/homebrew/cellar/curl/7.85.0/include" ) + # MESSAGE(INFO " Apple M1 curl path set to x86_64 versions /usr/local/homebrew/cellar/curl/7.85.0/") + #endif() ELSE(CURL_FOUND) MESSAGE(FATAL_ERROR "Could not find the CURL library and development files.") ENDIF(CURL_FOUND)