Skip to content

Commit daff6b5

Browse files
committed
ci(avalanchego-setup-action): correct Firewood setup path
1 parent 57329f2 commit daff6b5

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

scripts/setup_firewood.sh

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,54 @@
55
# Clones Firewood repository, builds/fetches the FFI, and updates go.mod
66
#
77
# Usage:
8-
# setup_firewood.sh <version>
8+
# setup_firewood.sh <version> [workspace]
99
#
1010
# Arguments:
1111
# version Firewood version (ffi/vX.Y.Z for pre-built, commit/branch for source)
12+
# workspace Optional workspace path for Firewood build (default: ${AVALANCHE_PATH}/firewood-workspace)
1213
#
1314
# Output:
1415
# Prints FFI path to stdout on success
1516

1617
set -euo pipefail
1718

1819
if [ $# -lt 1 ]; then
19-
echo "Usage: $0 <version>" >&2
20+
echo "Usage: $0 <version> [workspace]" >&2
2021
exit 1
2122
fi
2223

2324
FIREWOOD_VERSION="$1"
2425
AVALANCHE_PATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd .. && pwd )
2526
FIREWOOD_CLONE_DIR="${AVALANCHE_PATH}/firewood"
2627

28+
# Use provided workspace or default to avalanchego/firewood-workspace
29+
if [ $# -ge 2 ] && [ -n "$2" ]; then
30+
WORKSPACE_PATH="$2"
31+
else
32+
WORKSPACE_PATH="${AVALANCHE_PATH}/firewood-workspace"
33+
fi
34+
2735
if [ -d "${FIREWOOD_CLONE_DIR}" ]; then
2836
echo "Removing existing Firewood directory..." >&2
2937
rm -rf "${FIREWOOD_CLONE_DIR}"
3038
fi
3139

3240
echo "Setting up Firewood FFI version: ${FIREWOOD_VERSION}" >&2
41+
echo "Using workspace: ${WORKSPACE_PATH}" >&2
3342

3443
git clone https://github.com/ava-labs/firewood "${FIREWOOD_CLONE_DIR}" \
3544
--quiet --depth 1 --branch composable-ci-action
3645

37-
SETUP_FIREWOOD_SCRIPT="${FIREWOOD_CLONE_DIR}/.github/scripts/build.sh"
46+
SETUP_FIREWOOD_SCRIPT="${FIREWOOD_CLONE_DIR}/benchmark/setup-scripts/build-firewood.sh"
3847

3948
if [ ! -f "${SETUP_FIREWOOD_SCRIPT}" ]; then
4049
echo "Error: Setup Firewood script not found at ${SETUP_FIREWOOD_SCRIPT}" >&2
4150
exit 1
4251
fi
4352

44-
# Build or fetch Firewood FFI
53+
# Build or fetch Firewood FFI with custom workspace
4554
# Capture only the last line which is the FFI path
46-
FFI_PATH=$("${SETUP_FIREWOOD_SCRIPT}" "${FIREWOOD_VERSION}" 2>&1 | tail -n 1)
55+
FFI_PATH=$("${SETUP_FIREWOOD_SCRIPT}" "${FIREWOOD_VERSION}" --workspace "${WORKSPACE_PATH}" | tail -n 1)
4756

4857
if [ -z "${FFI_PATH}" ]; then
4958
echo "Error: Failed to build/fetch Firewood FFI" >&2

0 commit comments

Comments
 (0)