Skip to content

Commit cd15ef2

Browse files
committed
MONGOCRYPT-623 use include_expansions_in_env to pass expansions (#750)
use `include_expansions_in_env` to pass expansions as environment variables
1 parent eb5dc5b commit cd15ef2

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

.evergreen/config.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,19 @@ functions:
183183
./libmongocrypt/.evergreen/print-env-info.sh
184184
- command: shell.exec
185185
params:
186+
include_expansions_in_env:
187+
- nexus_username
188+
- nexus_password
189+
- signing_password
190+
- signing_keyId
191+
- ring_file_gpg_base64
192+
186193
script: |-
187194
if [ "${is_patch}" = "true" ]; then
188195
echo "Patch build detected, skipping"
189196
exit 0
190197
fi
191198
export PROJECT_DIRECTORY=${project_directory}
192-
export NEXUS_USERNAME=${nexus_username}
193-
export NEXUS_PASSWORD=${nexus_password}
194-
export SIGNING_PASSWORD=${signing_password}
195-
export SIGNING_KEY_ID=${signing_keyId}
196-
export RING_FILE_GPG_BASE64=${ring_file_gpg_base64}
197199
cd ./libmongocrypt/bindings/java/mongocrypt && ${test_env|} ./.evergreen/publish.sh
198200
199201
"download tarball":

bindings/java/mongocrypt/.evergreen/publish.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ set -o errexit # Exit the script with error if any of the commands fail
88
# Main Program #
99
############################################
1010

11-
echo ${RING_FILE_GPG_BASE64} | base64 -d > ${PROJECT_DIRECTORY}/secring.gpg
11+
echo ${ring_file_gpg_base64} | base64 -d > ${PROJECT_DIRECTORY}/secring.gpg
1212

1313
trap "rm ${PROJECT_DIRECTORY}/secring.gpg; exit" EXIT HUP
1414

15-
export ORG_GRADLE_PROJECT_nexusUsername=${NEXUS_USERNAME}
16-
export ORG_GRADLE_PROJECT_nexusPassword=${NEXUS_PASSWORD}
17-
export ORG_GRADLE_PROJECT_signing_keyId=${SIGNING_KEY_ID}
18-
export ORG_GRADLE_PROJECT_signing_password=${SIGNING_PASSWORD}
15+
export ORG_GRADLE_PROJECT_nexusUsername=${nexus_username}
16+
export ORG_GRADLE_PROJECT_nexusPassword=${nexus_password}
17+
export ORG_GRADLE_PROJECT_signing_keyId=${signing_keyId}
18+
export ORG_GRADLE_PROJECT_signing_password=${signing_password}
1919
export ORG_GRADLE_PROJECT_signing_secretKeyRingFile=${PROJECT_DIRECTORY}/secring.gpg
2020

2121
echo "Publishing snapshot with jdk11"

0 commit comments

Comments
 (0)