From 36176732cbd581e333bc6dfee64a0662f07c06d9 Mon Sep 17 00:00:00 2001 From: Oleksandr Poliakov Date: Mon, 18 Mar 2024 16:24:35 -0700 Subject: [PATCH 1/2] CSHARP-5004: Invoke all Drivers Evergreen Tools Scripts with Bash --- evergreen/build-apidocs.sh | 2 +- evergreen/build-packages.sh | 2 +- evergreen/evergreen.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/evergreen/build-apidocs.sh b/evergreen/build-apidocs.sh index 6db74569290..3a399a65fcd 100644 --- a/evergreen/build-apidocs.sh +++ b/evergreen/build-apidocs.sh @@ -2,7 +2,7 @@ set -o errexit # Exit the script with error if any of the commands fail if [ -z "$PACKAGE_VERSION" ]; then - PACKAGE_VERSION=$(sh ./evergreen/get-version.sh) + PACKAGE_VERSION=$(bash ./evergreen/get-version.sh) echo Calculated PACKAGE_VERSION value: "$PACKAGE_VERSION" fi diff --git a/evergreen/build-packages.sh b/evergreen/build-packages.sh index f4e5281773b..f09258efcd3 100644 --- a/evergreen/build-packages.sh +++ b/evergreen/build-packages.sh @@ -2,7 +2,7 @@ set -o errexit # Exit the script with error if any of the commands fail if [ -z "$PACKAGE_VERSION" ]; then - PACKAGE_VERSION=$(sh ./evergreen/get-version.sh) + PACKAGE_VERSION=$(bash ./evergreen/get-version.sh) echo Calculated PACKAGE_VERSION value: "$PACKAGE_VERSION" fi diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index 100549e6629..a4a83607341 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -101,7 +101,7 @@ functions: params: script: | ${PREPARE_SHELL} - sh ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh + bash ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh prepare-resources: - command: shell.exec @@ -229,7 +229,7 @@ functions: STORAGE_ENGINE=${STORAGE_ENGINE} \ ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \ SKIP_LEGACY_SHELL=${SKIP_LEGACY_SHELL} \ - sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh + bash ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh # run-orchestration generates expansion file with the MONGODB_URI for the cluster - command: expansions.update params: @@ -245,7 +245,7 @@ functions: AUTH=${AUTH} \ SSL=${SSL} \ ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \ - sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh + bash ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh - command: expansions.update params: file: mo-expansion.yml From bfef0bf3c9d28189d61a30faadfa6bf413f804d3 Mon Sep 17 00:00:00 2001 From: Oleksandr Poliakov Date: Tue, 19 Mar 2024 10:27:48 -0700 Subject: [PATCH 2/2] PR --- evergreen/evergreen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index a4a83607341..d3a36320050 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -47,7 +47,7 @@ functions: fi if [ "${BUILD_TARGET}" = "release" ]; then - PACKAGE_VERSION=$(sh ./evergreen/get-version.sh) + PACKAGE_VERSION=$(bash ./evergreen/get-version.sh) fi export DOTNET_SDK_PATH="$(pwd)/../.dotnet"