Merge branch 'main' into ni/oidc-bump

Author: nirinchev

.evergreen/install-node-source.sh

@@ -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)
+fi
 
 NODE_JS_TARBALL_FILE="node-v${NODE_JS_VERSION}.tar.gz"
 NODE_JS_TARBALL_PATH="${EVGDIR}/${NODE_JS_TARBALL_FILE}"
@@ -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
 

.evergreen/setup-env.sh

@@ -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
@@ -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"

THIRD_PARTY_NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **mongosh**.
-This document was automatically generated on Wed Feb 26 2025.
+This document was automatically generated on Sun Mar 02 2025.
 
 ## List of dependencies
 

packages/build/AUTHORS

@@ -24,3 +24,4 @@ Dylan Richardson <[email protected]>
 mongodb-devtools-bot[bot] <189715634+mongodb-devtools-bot[bot]@users.noreply.github.com>
 Ubuntu <[email protected]>
 Ubuntu <[email protected]>
+Alena Khineika <[email protected]>

packages/build/src/homebrew/generate-formula.ts

@@ -1,15 +1,37 @@
 import * as semver from 'semver';
 import type { GithubRepo } from '@mongodb-js/devtools-github-repo';
 
+/**
+ * When sending requests via Octokit, a situation can arise where the server closes the connection,
+ * but the client still believes it’s open and attempts to write to it,
+ * what leads to receiving an EPIPE error from the OS, indicating the connection has already been closed.
+ * In such cases, retrying the request can help establish a new, functional connection.
+ */
+async function getFormulaFromRepositoryWithRetry(
+  homebrewCore: GithubRepo,
+  remainingRetries = 3
+) {
+  try {
+    return await homebrewCore.getFileContent('Formula/m/mongosh.rb', 'master');
+  } catch (error: any) {
+    if (error.message.includes('EPIPE') && remainingRetries > 0) {
+      console.error(error);
+      return await getFormulaFromRepositoryWithRetry(
+        homebrewCore,
+        remainingRetries - 1
+      );
+    } else {
+      throw error;
+    }
+  }
+}
+
 export async function generateUpdatedFormula(
   context: { version: string; sha: string },
   homebrewCore: GithubRepo,
   isDryRun: boolean
 ): Promise<string | null> {
-  const currentFormula = await homebrewCore.getFileContent(
-    'Formula/m/mongosh.rb',
-    'master'
-  );
+  const currentFormula = await getFormulaFromRepositoryWithRetry(homebrewCore);
 
   const urlMatch = /url "([^"]+)"/g.exec(currentFormula.content);
   const shaMatch = /sha256 "([^"]+)"/g.exec(currentFormula.content);