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.

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

Add Conan Building For Development #432

Open
wants to merge 52 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
799a056
conan
dangell7 Feb 1, 2025
71884ad
sync
dangell7 Feb 1, 2025
2f6cf0a
[patch] remit transfer rate
dangell7 Feb 1, 2025
171610d
[release] add release build
dangell7 Feb 1, 2025
20ca066
[fold] update workflow
dangell7 Feb 2, 2025
56c0e0d
[fold] fix bad assert
dangell7 Feb 2, 2025
7162fe0
[fold] upgrade artifact@v4
dangell7 Feb 2, 2025
858ea1b
[fold] add external snappy
dangell7 Feb 2, 2025
7d8f5de
[fold] remove conan patch
dangell7 Feb 2, 2025
c27518b
[fold] use rippleci docker image
dangell7 Feb 2, 2025
bf33b6f
[fold] update conan
dangell7 Feb 2, 2025
fe43029
[fold] clang-format
dangell7 Feb 2, 2025
97a10d6
[fold] fix test
dangell7 Feb 4, 2025
b7acfb9
fix misc warnings
dangell7 Feb 4, 2025
cd45285
include optional
dangell7 Feb 4, 2025
4b93e16
fix macos github action
dangell7 Feb 4, 2025
26a66bc
fix misc warnings
dangell7 Feb 4, 2025
7c360ba
add optional include
dangell7 Feb 5, 2025
ee68cc2
clang-format
dangell7 Feb 5, 2025
9faef17
fix bad commit
dangell7 Feb 6, 2025
6858861
fix failing test
dangell7 Feb 7, 2025
680c609
Update macos.yml
dangell7 Feb 11, 2025
ecc7793
Merge branch 'dev' into tmp-conan
dangell7 Feb 11, 2025
802ea6c
[temp] remove negative rate test
dangell7 Feb 11, 2025
6fdf788
Merge branch 'dev' into tmp-conan
dangell7 Feb 28, 2025
da5f1d1
Merge branch 'dev' into tmp-conan
dangell7 Mar 5, 2025
5ef3795
[fix] release build issue
dangell7 Mar 6, 2025
0726789
update conan to 1.86
dangell7 Mar 21, 2025
b73dd58
Merge branch 'dev' into tmp-conan
dangell7 Mar 21, 2025
58e3840
remove `cxxflags` for macos action
dangell7 Mar 24, 2025
40dc69d
[GA] conan mac os build
dangell7 Mar 25, 2025
17fdd09
[GA] update conan profile
dangell7 Mar 25, 2025
9178aa9
[GA] remove unused workflows
dangell7 Mar 25, 2025
69b7728
[GA] tmp disable build cache
dangell7 Mar 25, 2025
9c26f1f
[GA] revert
dangell7 Mar 25, 2025
48919f0
[GA] Remove build caching
dangell7 Mar 25, 2025
689740d
Use GA runners with conan/ccache caches (#482)
sublimator Mar 28, 2025
864734f
Update xahau-sh-build-in-docker.yml
dangell7 Mar 28, 2025
245cf4a
refactor checkpatterns remove comments
dangell7 Mar 28, 2025
5eac2d3
change `on` fields
dangell7 Mar 28, 2025
ed24374
fix checkpatterns
dangell7 Mar 28, 2025
2d9ac91
fix build dir
dangell7 Mar 28, 2025
ddbbe91
attempt fix builder
dangell7 Mar 28, 2025
9a90a7f
optional release builder
dangell7 Mar 28, 2025
cab4d63
revert some cmake builds
dangell7 Mar 28, 2025
a8e9448
revert docker dependency cache
dangell7 Mar 29, 2025
859dcbc
remove `EXIT_IF_CONTAINER_RUNNING`
dangell7 Mar 29, 2025
313ad71
test workflow
dangell7 Mar 29, 2025
95ab35a
Update release-builder.sh
dangell7 Mar 29, 2025
f8d22bb
add caching
dangell7 Mar 29, 2025
c27e2a9
Update xahau-sh-build-in-docker.yml
dangell7 Mar 29, 2025
8b0592c
Update xahau-sh-build-in-docker.yml
dangell7 Mar 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'dev' into tmp-conan
  • Loading branch information
dangell7 authored Feb 11, 2025
commit ecc779346ea24cb795c1c6d3dd7d97b0ee25cc91
2 changes: 1 addition & 1 deletion src/ripple/protocol/impl/TxMeta.cpp
Original file line number Diff line number Diff line change
@@ -241,7 +241,7 @@ TxMeta::addRaw(Serializer& s, TER result, std::uint32_t index)
mResult = TERtoInt(result);
mIndex = index;
assert(
(mResult == 0) || (mResult == 1) ||
(mResult == 0 || mResult == 1) ||
((mResult > 100) && (mResult <= 255)));

mNodes.sort([](STObject const& o1, STObject const& o2) {
You are viewing a condensed version of this merge commit. You can view the full changes here.