diff --git a/build-system/scripts/build b/build-system/scripts/build index ece5a99a516..d02b4ebd901 100755 --- a/build-system/scripts/build +++ b/build-system/scripts/build @@ -127,6 +127,8 @@ if [[ -n "$COMMIT_TAG" ]]; then VERSION=$(npx semver $COMMIT_TAG_VERSION) if [ -z "$VERSION" ]; then COMMIT_TAG_VERSION="" + else + COMMIT_TAG_VERSION=$VERSION fi else COMMIT_TAG_VERSION="" diff --git a/yarn-project/aztec-cli/src/client.ts b/yarn-project/aztec-cli/src/client.ts index f1ec98bbb24..d7b6c6ec162 100644 --- a/yarn-project/aztec-cli/src/client.ts +++ b/yarn-project/aztec-cli/src/client.ts @@ -33,7 +33,7 @@ export async function createCompatibleClient(rpcUrl: string, logger: DebugLogger const expectedVersionRange = packageJsonContents.version; // During sandbox, we'll expect exact matches try { - await checkServerVersion(client, expectedVersionRange, logger); + await checkServerVersion(client, expectedVersionRange); } catch (err) { if (err instanceof VersionMismatchError) { logger.debug(err.message); @@ -53,14 +53,13 @@ class VersionMismatchError extends Error {} * @param rpc - RPC server connection. * @param expectedVersionRange - Expected version by CLI. */ -export async function checkServerVersion(rpc: AztecRPC, expectedVersionRange: string, logger?: DebugLogger) { +export async function checkServerVersion(rpc: AztecRPC, expectedVersionRange: string) { const serverName = 'Aztec Sandbox'; const { client } = await rpc.getNodeInfo(); if (!client) { throw new VersionMismatchError(`Couldn't determine ${serverName} version. You may run into issues.`); } const version = client.split('@')[1]; - logger?.warn(`Comparing server version ${version} against CLI expected ${expectedVersionRange}`); if (!version || !valid(version)) { throw new VersionMismatchError(`Missing or invalid version identifier for ${serverName} (${version ?? 'empty'}).`); } else if (!satisfies(version, expectedVersionRange)) {