Skip to content

Commit

Permalink
Merge pull request #15599 from MinaProtocol/georgeee/fix-build-hardfo…
Browse files Browse the repository at this point in the history
…rk-package-default-env-vars-alt-develop

[Develop] Fix verification in dry runs: alternative take
  • Loading branch information
ghost-not-in-the-shell authored May 3, 2024
2 parents ec0d90d + ff6d82e commit 9f38ff1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
3 changes: 1 addition & 2 deletions scripts/deb-builder-helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,11 @@ case "${MINA_DEB_CODENAME}" in
esac

case "${DUNE_PROFILE}" in
devnet)
devnet|mainnet)
MINA_DEB_NAME="mina-berkeley"
DEB_SUFFIX=""
;;
*)

# use dune profile as suffix but replace underscore to dashes so deb builder won't complain
_SUFFIX=${DUNE_PROFILE//_/-}
MINA_DEB_NAME="mina-berkeley-${_SUFFIX}"
Expand Down
10 changes: 7 additions & 3 deletions scripts/mina-verify-packaged-fork-config
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -eo pipefail

if [ $# -lt 2 ]; then
echo "Usage: $0 <network-name> <fork-config.json> <working-dir>"
if [ $# -lt 3 ]; then
echo "Usage: $0 <network-name> <fork-config.json> <working-dir> <optional: precomputed block prefix>"
cat <<EOF
This script is used to validate that an installed package is correct
according to an exported fork_config.json file.
Expand Down Expand Up @@ -89,7 +89,11 @@ fork_block_length=$(jq -r '.proof.fork.blockchain_length' "$2")
# Put the fork block where we want it, fetch it from gcloud if necessary
if [ ! -e "$PRECOMPUTED_FORK_BLOCK" ]; then
if [ "$PRECOMPUTED_FORK_BLOCK" = "" ]; then
PRECOMPUTED_FORK_BLOCK="gs://mina_network_block_data/$1-$fork_block_length-$fork_block_state_hash.json"
prefix=$4
if [ "$prefix" = "" ]; then
prefix="gs://mina_network_block_data/$1"
fi
PRECOMPUTED_FORK_BLOCK="$prefix-$fork_block_length-$fork_block_state_hash.json"
fi
"$GSUTIL" cp "$PRECOMPUTED_FORK_BLOCK" "$workdir/precomputed_fork_block.json"
else
Expand Down

0 comments on commit 9f38ff1

Please sign in to comment.