Skip to content

Commit 985d607

Browse files
pmienkpmienk
committed
Regenerate artifacts.
1 parent 27178f8 commit 985d607

File tree

3 files changed

+39
-15
lines changed

3 files changed

+39
-15
lines changed

‎install-cmake.sh‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@
3838

3939
# Define constants.
4040
#==============================================================================
41+
# Branches for github dependencies.
42+
#------------------------------------------------------------------------------
43+
SECP256K1_BRANCH="v0.5.1"
44+
BITCOIN_SYSTEM_BRANCH="master"
45+
BITCOIN_NETWORK_BRANCH="master"
46+
BITCOIN_DATABASE_BRANCH="master"
47+
BITCOIN_NODE_BRANCH="master"
48+
4149
# Sentinel for comparison of sequential build.
4250
#------------------------------------------------------------------------------
4351
SEQUENTIAL=1
@@ -919,30 +927,30 @@ build_all()
919927
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
920928
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
921929
export CPPFLAGS=$SAVE_CPPFLAGS
922-
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
930+
create_from_github bitcoin-core secp256k1 ${SECP256K1_BRANCH} "$BUILD_SECP256K1"
923931
local SAVE_CPPFLAGS="$CPPFLAGS"
924932
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
925933
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
926934
export CPPFLAGS=$SAVE_CPPFLAGS
927-
create_from_github libbitcoin libbitcoin-system master "yes"
935+
create_from_github libbitcoin libbitcoin-system ${BITCOIN_SYSTEM_BRANCH} "yes"
928936
local SAVE_CPPFLAGS="$CPPFLAGS"
929937
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
930938
build_from_github_cmake libbitcoin-system "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
931939
export CPPFLAGS=$SAVE_CPPFLAGS
932-
create_from_github libbitcoin libbitcoin-network master "yes"
940+
create_from_github libbitcoin libbitcoin-network ${BITCOIN_NETWORK_BRANCH} "yes"
933941
local SAVE_CPPFLAGS="$CPPFLAGS"
934942
export CPPFLAGS="$CPPFLAGS ${BITCOIN_NETWORK_FLAGS[@]}"
935943
build_from_github_cmake libbitcoin-network "$PARALLEL" false "yes" "${BITCOIN_NETWORK_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
936944
export CPPFLAGS=$SAVE_CPPFLAGS
937-
create_from_github libbitcoin libbitcoin-database master "yes"
945+
create_from_github libbitcoin libbitcoin-database ${BITCOIN_DATABASE_BRANCH} "yes"
938946
local SAVE_CPPFLAGS="$CPPFLAGS"
939947
export CPPFLAGS="$CPPFLAGS ${BITCOIN_DATABASE_FLAGS[@]}"
940948
build_from_github_cmake libbitcoin-database "$PARALLEL" false "yes" "${BITCOIN_DATABASE_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
941949
export CPPFLAGS=$SAVE_CPPFLAGS
942950
local SAVE_CPPFLAGS="$CPPFLAGS"
943951
export CPPFLAGS="$CPPFLAGS ${BITCOIN_NODE_FLAGS[@]}"
944952
if [[ ! ($CI == true) ]]; then
945-
create_from_github libbitcoin libbitcoin-node master "yes"
953+
create_from_github libbitcoin libbitcoin-node ${BITCOIN_NODE_BRANCH} "yes"
946954
build_from_github_cmake libbitcoin-node "$PARALLEL" true "yes" "${BITCOIN_NODE_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
947955
else
948956
push_directory "$PRESUMED_CI_PROJECT_PATH"

‎install-cmakepresets.sh‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
3939

4040
# Define constants.
4141
#==============================================================================
42+
# Branches for github dependencies.
43+
#------------------------------------------------------------------------------
44+
SECP256K1_BRANCH="v0.5.1"
45+
BITCOIN_SYSTEM_BRANCH="master"
46+
BITCOIN_NETWORK_BRANCH="master"
47+
BITCOIN_DATABASE_BRANCH="master"
48+
BITCOIN_NODE_BRANCH="master"
49+
4250

4351
# Declare associative array for computed presets.
4452
#------------------------------------------------------------------------------
@@ -962,24 +970,24 @@ build_all()
962970
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
963971
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
964972
export CPPFLAGS=$SAVE_CPPFLAGS
965-
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
973+
create_from_github bitcoin-core secp256k1 ${SECP256K1_BRANCH} "$BUILD_SECP256K1"
966974
local SAVE_CPPFLAGS="$CPPFLAGS"
967975
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
968976
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
969977
export CPPFLAGS=$SAVE_CPPFLAGS
970-
create_from_github libbitcoin libbitcoin-system master "yes"
978+
create_from_github libbitcoin libbitcoin-system ${BITCOIN_SYSTEM_BRANCH} "yes"
971979
local SAVE_CPPFLAGS="$CPPFLAGS"
972980
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
973981
display_message "libbitcoin-system PRESET ${REPO_PRESET[libbitcoin-system]}"
974982
build_from_github_cmake libbitcoin-system ${REPO_PRESET[libbitcoin-system]} "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
975983
export CPPFLAGS=$SAVE_CPPFLAGS
976-
create_from_github libbitcoin libbitcoin-network master "yes"
984+
create_from_github libbitcoin libbitcoin-network ${BITCOIN_NETWORK_BRANCH} "yes"
977985
local SAVE_CPPFLAGS="$CPPFLAGS"
978986
export CPPFLAGS="$CPPFLAGS ${BITCOIN_NETWORK_FLAGS[@]}"
979987
display_message "libbitcoin-network PRESET ${REPO_PRESET[libbitcoin-network]}"
980988
build_from_github_cmake libbitcoin-network ${REPO_PRESET[libbitcoin-network]} "$PARALLEL" false "yes" "${BITCOIN_NETWORK_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
981989
export CPPFLAGS=$SAVE_CPPFLAGS
982-
create_from_github libbitcoin libbitcoin-database master "yes"
990+
create_from_github libbitcoin libbitcoin-database ${BITCOIN_DATABASE_BRANCH} "yes"
983991
local SAVE_CPPFLAGS="$CPPFLAGS"
984992
export CPPFLAGS="$CPPFLAGS ${BITCOIN_DATABASE_FLAGS[@]}"
985993
display_message "libbitcoin-database PRESET ${REPO_PRESET[libbitcoin-database]}"
@@ -988,7 +996,7 @@ build_all()
988996
local SAVE_CPPFLAGS="$CPPFLAGS"
989997
export CPPFLAGS="$CPPFLAGS ${BITCOIN_NODE_FLAGS[@]}"
990998
if [[ ! ($CI == true) ]]; then
991-
create_from_github libbitcoin libbitcoin-node master "yes"
999+
create_from_github libbitcoin libbitcoin-node ${BITCOIN_NODE_BRANCH} "yes"
9921000
display_message "libbitcoin-node PRESET ${REPO_PRESET[libbitcoin-node]}"
9931001
build_from_github_cmake libbitcoin-node ${REPO_PRESET[libbitcoin-node]} "$PARALLEL" true "yes" "${BITCOIN_NODE_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
9941002
else

‎install.sh‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@
3838

3939
# Define constants.
4040
#==============================================================================
41+
# Branches for github dependencies.
42+
#------------------------------------------------------------------------------
43+
SECP256K1_BRANCH="v0.5.1"
44+
BITCOIN_SYSTEM_BRANCH="master"
45+
BITCOIN_NETWORK_BRANCH="master"
46+
BITCOIN_DATABASE_BRANCH="master"
47+
BITCOIN_NODE_BRANCH="master"
48+
4149
# Sentinel for comparison of sequential build.
4250
#------------------------------------------------------------------------------
4351
SEQUENTIAL=1
@@ -794,30 +802,30 @@ build_all()
794802
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
795803
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
796804
export CPPFLAGS=$SAVE_CPPFLAGS
797-
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
805+
create_from_github bitcoin-core secp256k1 ${SECP256K1_BRANCH} "$BUILD_SECP256K1"
798806
local SAVE_CPPFLAGS="$CPPFLAGS"
799807
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
800808
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" "$@"
801809
export CPPFLAGS=$SAVE_CPPFLAGS
802-
create_from_github libbitcoin libbitcoin-system master "yes"
810+
create_from_github libbitcoin libbitcoin-system ${BITCOIN_SYSTEM_BRANCH} "yes"
803811
local SAVE_CPPFLAGS="$CPPFLAGS"
804812
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
805813
build_from_github libbitcoin-system "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" "$@"
806814
export CPPFLAGS=$SAVE_CPPFLAGS
807-
create_from_github libbitcoin libbitcoin-network master "yes"
815+
create_from_github libbitcoin libbitcoin-network ${BITCOIN_NETWORK_BRANCH} "yes"
808816
local SAVE_CPPFLAGS="$CPPFLAGS"
809817
export CPPFLAGS="$CPPFLAGS ${BITCOIN_NETWORK_FLAGS[@]}"
810818
build_from_github libbitcoin-network "$PARALLEL" false "yes" "${BITCOIN_NETWORK_OPTIONS[@]}" "$@"
811819
export CPPFLAGS=$SAVE_CPPFLAGS
812-
create_from_github libbitcoin libbitcoin-database master "yes"
820+
create_from_github libbitcoin libbitcoin-database ${BITCOIN_DATABASE_BRANCH} "yes"
813821
local SAVE_CPPFLAGS="$CPPFLAGS"
814822
export CPPFLAGS="$CPPFLAGS ${BITCOIN_DATABASE_FLAGS[@]}"
815823
build_from_github libbitcoin-database "$PARALLEL" false "yes" "${BITCOIN_DATABASE_OPTIONS[@]}" "$@"
816824
export CPPFLAGS=$SAVE_CPPFLAGS
817825
local SAVE_CPPFLAGS="$CPPFLAGS"
818826
export CPPFLAGS="$CPPFLAGS ${BITCOIN_NODE_FLAGS[@]}"
819827
if [[ ! ($CI == true) ]]; then
820-
create_from_github libbitcoin libbitcoin-node master "yes"
828+
create_from_github libbitcoin libbitcoin-node ${BITCOIN_NODE_BRANCH} "yes"
821829
build_from_github libbitcoin-node "$PARALLEL" true "yes" "${BITCOIN_NODE_OPTIONS[@]}" "$@"
822830
else
823831
push_directory "$PRESUMED_CI_PROJECT_PATH"

0 commit comments

Comments
 (0)