Skip to content

Commit

Permalink
CI updates
Browse files Browse the repository at this point in the history
  • Loading branch information
dynexcoin committed Dec 4, 2023
1 parent bb72db4 commit 202efa0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 202efa0

Please sign in to comment.