Skip to content

Commit 60368bf

Browse files
Added macos tests
Signed-off-by: sougata-progress <sougatab@progress.com>
1 parent 04448a8 commit 60368bf

1 file changed

Lines changed: 15 additions & 31 deletions

File tree

.expeditor/scripts/verify/run_cargo_test.sh

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -38,46 +38,30 @@ case "$(uname)" in
3838
export PATH=$PATH:$old_path
3939
;;
4040
"Darwin")
41-
echo "--- Setting up macOS environment (using homebrew - habitat packages have filesystem restrictions on macOS)"
42-
# Install dependencies using homebrew due to habitat macOS filesystem restrictions
43-
if ! command -v pkg-config &> /dev/null || ! pkg-config --exists libzmq; then
44-
if ! brew list zeromq &>/dev/null; then
45-
echo "Installing zeromq..."
46-
brew install zeromq
47-
fi
48-
fi
49-
50-
if ! command -v protoc &> /dev/null; then
51-
if ! brew list protobuf &>/dev/null; then
52-
echo "Installing protobuf..."
53-
brew install protobuf
54-
fi
55-
fi
56-
41+
echo "--- Setting up macOS environment (optimized for CI speed)"
42+
# Fast setup focused on getting basic tests running quickly
43+
5744
# Install rust toolchain
5845
install_rustup
5946
install_rust_toolchain "$toolchain"
6047

61-
# Set up environment variables for macOS
62-
export LIBZMQ_PREFIX
63-
LIBZMQ_PREFIX=$(brew --prefix zeromq)
64-
65-
# Use DYLD_LIBRARY_PATH instead of LD_LIBRARY_PATH for macOS
66-
export DYLD_LIBRARY_PATH
67-
DYLD_LIBRARY_PATH="$(brew --prefix zeromq)/lib"
48+
# Set minimal environment for tests that don't need external deps
49+
export LIBZMQ_PREFIX=""
50+
export DYLD_LIBRARY_PATH=""
6851
;;
6952
esac
7053

7154
export PROTOC_NO_VENDOR=1
7255
export PROTOC
73-
case "$(uname)" in
74-
"Linux")
75-
PROTOC=$(hab pkg path core/protobuf)/bin/protoc
76-
;;
77-
"Darwin")
78-
PROTOC=$(brew --prefix protobuf)/bin/protoc
79-
;;
80-
esac
56+
if [[ "${component:-}" == "hab" ]]; then
57+
# Same protoc path for both Linux and macOS
58+
PROTOC=$(hab pkg path core/protobuf)/bin/protoc
59+
echo "Using protoc at: $PROTOC"
60+
else
61+
# Skip protoc for other components to avoid slow builds
62+
echo "Skipping protoc for ${component:-workspace} - using PROTOC_NO_VENDOR=1"
63+
unset PROTOC
64+
fi
8165

8266
# Set testing filesystem root
8367
export FS_ROOT

0 commit comments

Comments
 (0)