Skip to content

Commit

Permalink
Regenerate artifacts.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmienk committed Jan 4, 2025
1 parent 605470a commit 758dc89
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
9 changes: 7 additions & 2 deletions install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@

# Define constants.
#==============================================================================
# Branches for github dependencies.
#------------------------------------------------------------------------------
SECP256K1_BRANCH="v0.5.1"
BITCOIN_SYSTEM_BRANCH="master"

# Sentinel for comparison of sequential build.
#------------------------------------------------------------------------------
SEQUENTIAL=1
Expand Down Expand Up @@ -919,15 +924,15 @@ build_all()
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
export CPPFLAGS=$SAVE_CPPFLAGS
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
create_from_github bitcoin-core secp256k1 ${SECP256K1_BRANCH} "$BUILD_SECP256K1"
local SAVE_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
export CPPFLAGS=$SAVE_CPPFLAGS
local SAVE_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
if [[ ! ($CI == true) ]]; then
create_from_github libbitcoin libbitcoin-system master "yes"
create_from_github libbitcoin libbitcoin-system ${BITCOIN_SYSTEM_BRANCH} "yes"
build_from_github_cmake libbitcoin-system "$PARALLEL" true "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
else
push_directory "$PRESUMED_CI_PROJECT_PATH"
Expand Down
9 changes: 7 additions & 2 deletions install-cmakepresets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@

# Define constants.
#==============================================================================
# Branches for github dependencies.
#------------------------------------------------------------------------------
SECP256K1_BRANCH="v0.5.1"
BITCOIN_SYSTEM_BRANCH="master"


# Declare associative array for computed presets.
#------------------------------------------------------------------------------
Expand Down Expand Up @@ -962,15 +967,15 @@ build_all()
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
export CPPFLAGS=$SAVE_CPPFLAGS
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
create_from_github bitcoin-core secp256k1 ${SECP256K1_BRANCH} "$BUILD_SECP256K1"
local SAVE_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
export CPPFLAGS=$SAVE_CPPFLAGS
local SAVE_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
if [[ ! ($CI == true) ]]; then
create_from_github libbitcoin libbitcoin-system master "yes"
create_from_github libbitcoin libbitcoin-system ${BITCOIN_SYSTEM_BRANCH} "yes"
display_message "libbitcoin-system PRESET ${REPO_PRESET[libbitcoin-system]}"
build_from_github_cmake libbitcoin-system ${REPO_PRESET[libbitcoin-system]} "$PARALLEL" true "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
else
Expand Down
9 changes: 7 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@

# Define constants.
#==============================================================================
# Branches for github dependencies.
#------------------------------------------------------------------------------
SECP256K1_BRANCH="v0.5.1"
BITCOIN_SYSTEM_BRANCH="master"

# Sentinel for comparison of sequential build.
#------------------------------------------------------------------------------
SEQUENTIAL=1
Expand Down Expand Up @@ -794,15 +799,15 @@ build_all()
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
export CPPFLAGS=$SAVE_CPPFLAGS
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
create_from_github bitcoin-core secp256k1 ${SECP256K1_BRANCH} "$BUILD_SECP256K1"
local SAVE_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" "$@"
export CPPFLAGS=$SAVE_CPPFLAGS
local SAVE_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
if [[ ! ($CI == true) ]]; then
create_from_github libbitcoin libbitcoin-system master "yes"
create_from_github libbitcoin libbitcoin-system ${BITCOIN_SYSTEM_BRANCH} "yes"
build_from_github libbitcoin-system "$PARALLEL" true "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" "$@"
else
push_directory "$PRESUMED_CI_PROJECT_PATH"
Expand Down

0 comments on commit 758dc89

Please sign in to comment.