Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update external dependencies #284

Merged
merged 14 commits into from
Mar 26, 2022
+24,150 −40,383
Merged

Update external dependencies #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
10e065d
Remove sparsehash
AxVultis Feb 20, 2022
fdd34e6
Merge branch 'development' into sparsehash
AxVultis Feb 26, 2022
ef629aa
Update miniupnpc to version 2.2.3
AxVultis Feb 26, 2022
3dcb98c
Update parallel_hashmap to version 1.33
AxVultis Feb 26, 2022
3efc1f9
Update googletest to version 1.11.0
AxVultis Feb 26, 2022
0256d9b
Update miniupnpc to version 2.2.3
AxVultis Feb 26, 2022
61da6de
Update googletest to version 1.11.0
AxVultis Feb 26, 2022
8bb90df
Merge branch 'miniupnpc' into dependencies-update
AxVultis Mar 6, 2022
8af157d
Merge branch 'parallel_hashmap' into dependencies-update
AxVultis Mar 6, 2022
3171323
Merge branch 'gtest' into dependencies-update
AxVultis Mar 6, 2022
c48de4f
Update parallel_hashmap to version 1.34
AxVultis Mar 6, 2022
4e28c8d
Update blockcache archive version
AxVultis Mar 10, 2022
b1cf6a2
Merge branch 'parallel_hashmap' into dependencies-update
AxVultis Mar 12, 2022
3afd930
Fix undefined warning
AxVultis Mar 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
116 changes: 58 additions & 58 deletions .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,38 +49,38 @@ jobs:
- name: Prepare release
shell: powershell
run: |
mkdir build/bin
mv build/src/Release/conceald.exe build/bin
mv build/src/Release/concealwallet.exe build/bin
mv build/src/Release/optimizer.exe build/bin
mv build/src/Release/walletd.exe build/bin
mv build/tests/Release/*_tests.exe build/bin
mkdir build/conceal
mv build/src/Release/conceald.exe build/conceal
mv build/src/Release/concealwallet.exe build/conceal
mv build/src/Release/optimizer.exe build/conceal
mv build/src/Release/walletd.exe build/conceal
mv build/tests/Release/*_tests.exe build/conceal

- name: Upload To GH Artifacts
uses: actions/upload-artifact@v2
with:
name: ${{ steps.setup.outputs.release_name }}
path: build/bin
path: build/conceal
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: core_tests
shell: powershell
run: |
cd build/bin
cd build/conceal
./core_tests.exe --generate_and_play_test_data

- name: difficulty_tests
shell: powershell
run: |
cp tests/Difficulty/data.txt build/bin
cd build/bin
cp tests/Difficulty/data.txt build/conceal
cd build/conceal
./difficulty_tests.exe data.txt

- name: performance_tests
shell: powershell
run: |
cd build/bin
cd build/conceal
./performance_tests.exe

build-ubuntu18:
Expand Down Expand Up @@ -112,40 +112,40 @@ jobs:

- name: Prepare release
run: |
mkdir build/bin
mv build/src/conceald build/bin
mv build/src/concealwallet build/bin
mv build/src/optimizer build/bin
mv build/src/walletd build/bin
mv build/tests/*_tests build/bin
mkdir build/conceal
mv build/src/conceald build/conceal
mv build/src/concealwallet build/conceal
mv build/src/optimizer build/conceal
mv build/src/walletd build/conceal
mv build/tests/*_tests build/conceal

- name: Upload To GH Artifacts
uses: actions/upload-artifact@v2
with:
name: ${{ steps.setup.outputs.release_name }}
path: build/bin
path: build/conceal
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: core_tests
run: |
cd build/bin
cd build/conceal
./core_tests --generate_and_play_test_data

- name: difficulty_tests
run: |
cp tests/Difficulty/data.txt build/bin
cd build/bin
cp tests/Difficulty/data.txt build/conceal
cd build/conceal
./difficulty_tests data.txt

- name: performance_tests
run: |
cd build/bin
cd build/conceal
./performance_tests

- name: system_tests
run: |
cd build/bin
cd build/conceal
./system_tests

build-ubuntu20:
Expand Down Expand Up @@ -177,40 +177,40 @@ jobs:

- name: Prepare release
run: |
mkdir build/bin
mv build/src/conceald build/bin
mv build/src/concealwallet build/bin
mv build/src/optimizer build/bin
mv build/src/walletd build/bin
mv build/tests/*_tests build/bin
mkdir build/conceal
mv build/src/conceald build/conceal
mv build/src/concealwallet build/conceal
mv build/src/optimizer build/conceal
mv build/src/walletd build/conceal
mv build/tests/*_tests build/conceal

- name: Upload To GH Artifacts
uses: actions/upload-artifact@v2
with:
name: ${{ steps.setup.outputs.release_name }}
path: build/bin
path: build/conceal
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: core_tests
run: |
cd build/bin
cd build/conceal
./core_tests --generate_and_play_test_data

- name: difficulty_tests
run: |
cp tests/Difficulty/data.txt build/bin
cd build/bin
cp tests/Difficulty/data.txt build/conceal
cd build/conceal
./difficulty_tests data.txt

- name: performance_tests
run: |
cd build/bin
cd build/conceal
./performance_tests

- name: system_tests
run: |
cd build/bin
cd build/conceal
./system_tests

build-ubuntu20-clang:
Expand Down Expand Up @@ -242,40 +242,40 @@ jobs:

- name: Prepare release
run: |
mkdir build/bin
mv build/src/conceald build/bin
mv build/src/concealwallet build/bin
mv build/src/optimizer build/bin
mv build/src/walletd build/bin
mv build/tests/*_tests build/bin
mkdir build/conceal
mv build/src/conceald build/conceal
mv build/src/concealwallet build/conceal
mv build/src/optimizer build/conceal
mv build/src/walletd build/conceal
mv build/tests/*_tests build/conceal

- name: Upload To GH Artifacts
uses: actions/upload-artifact@v2
with:
name: ${{ steps.setup.outputs.release_name }}
path: build/bin
path: build/conceal
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: core_tests
run: |
cd build/bin
cd build/conceal
./core_tests --generate_and_play_test_data

- name: difficulty_tests
run: |
cp tests/Difficulty/data.txt build/bin
cd build/bin
cp tests/Difficulty/data.txt build/conceal
cd build/conceal
./difficulty_tests data.txt

- name: performance_tests
run: |
cd build/bin
cd build/conceal
./performance_tests

- name: system_tests
run: |
cd build/bin
cd build/conceal
./system_tests

build-macos11:
Expand Down Expand Up @@ -306,33 +306,33 @@ jobs:

- name: Prepare release
run: |
mkdir build/bin
mv build/src/conceald build/bin
mv build/src/concealwallet build/bin
mv build/src/optimizer build/bin
mv build/src/walletd build/bin
mv build/tests/*_tests build/bin
mkdir build/conceal
mv build/src/conceald build/conceal
mv build/src/concealwallet build/conceal
mv build/src/optimizer build/conceal
mv build/src/walletd build/conceal
mv build/tests/*_tests build/conceal

- name: Upload To GH Artifacts
uses: actions/upload-artifact@v2
with:
name: ${{ steps.setup.outputs.release_name }}
path: build/bin
path: build/conceal
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: core_tests
run: |
cd build/bin
cd build/conceal
./core_tests --generate_and_play_test_data

- name: difficulty_tests
run: |
cp tests/Difficulty/data.txt build/bin
cd build/bin
cp tests/Difficulty/data.txt build/conceal
cd build/conceal
./difficulty_tests data.txt

- name: performance_tests
run: |
cd build/bin
cd build/conceal
./performance_tests
6 changes: 3 additions & 3 deletions external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ if (DO_TESTS)
add_subdirectory(gtest)
endif()

set_property(TARGET upnpc-static PROPERTY FOLDER "external")
set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")

if(MSVC)
set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
elseif(NOT MSVC)
set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
endif()

if(DO_TESTS)
Expand Down
Loading