Skip to content

chore(ci): don't use gcc on macOS MONGOSH-2029 #2390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nirinchev merged 3 commits into from
Mar 3, 2025
Merged

chore(ci): don't use gcc on macOS MONGOSH-2029 #2390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c824ce
chore(ci): use toolchain v4 for arm64 runners
nirinchev Feb 27, 2025
5298acc
Don't use gcc on macOS
nirinchev Feb 27, 2025
c0a7901
print clang versions
nirinchev Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions .evergreen/install-node-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,25 @@ else
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
fi
export PATH="$TOOLCHAIN_PATH:/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
export PATH="$TOOLCHAIN_PATH:${ORIGINAL_PATH}"

export PATH="/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
export CC=gcc
export CXX=g++

if [ `uname` = Darwin ]; then
echo "Using clang version:"
(which clang && clang --version)

echo "Using clang++ version:"
(which clang++ && clang++ --version)
else
export CC=gcc
export CXX=g++

echo "Using gcc version:"
(which gcc && gcc --version)

echo "Using g++ version:"
(which g++ && g++ --version)
Copy link
Collaborator

@addaleax addaleax Feb 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we still print the compiler versions in the darwin case?

fi

NODE_JS_TARBALL_FILE="node-v${NODE_JS_VERSION}.tar.gz"
NODE_JS_TARBALL_PATH="${EVGDIR}/${NODE_JS_TARBALL_FILE}"
Expand All @@ -29,12 +43,6 @@ NODE_JS_SOURCE_PATH="${EVGDIR}/node-v${NODE_JS_VERSION}"
# scripts to simply do `nvm use`
NODE_JS_INSTALL_DIR="${NVM_DIR}/versions/node/v${NODE_JS_VERSION}"

echo "Using gcc version:"
(which gcc && gcc --version)

echo "Using g++ version:"
(which g++ && g++ --version)

echo "Using python3 version:"
(which python3 && python3 --version) || true

Expand Down
22 changes: 15 additions & 7 deletions .evergreen/setup-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set -e
set -x

OS_ARCH="$(uname "-m")"
if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] ; then
if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ]; then
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
else
Expand Down Expand Up @@ -38,14 +38,22 @@ if [ "$OS" != "Windows_NT" ]; then
set -x
export PATH="$NVM_BIN:$PATH"

export CC=gcc
export CXX=g++
if [ `uname` = Darwin ]; then
echo "Using clang version:"
(which clang && clang --version)

echo "Using gcc version:"
(which gcc && gcc --version)
echo "Using clang++ version:"
(which clang++ && clang++ --version)
else
export CC=gcc
export CXX=g++

echo "Using g++ version:"
(which g++ && g++ --version)
echo "Using gcc version:"
(which gcc && gcc --version)

echo "Using g++ version:"
(which g++ && g++ --version)
fi

if [ -x "$BASEDIR/git-2/git" ]; then
export GIT_EXEC_PATH="$BASEDIR/git-2"
Expand Down