Skip to content

Commit 3f62f0c

Browse files
committed
Merge branch 'main' into ni/cta
* main: (34 commits) chore: update auto-generated files [skip actions] chore: update auto-generated files [skip actions] chore(ci): use github app tokens instead of bot user (#2282) chore: update auto-generated files [skip actions] chore(ci): cleanup auto generated file workflow MONGOSH-1927 (#2281) chore: update auto-generated files chore(ci): use a github app for the generated files credentials MONGOSH-1927 (#2280) chore(deps): bump driver, bson, oidc-plugin to latest MONGOSH-1916 (#2279) chore(ci): login to docker (#2277) chore(ci): don't download chrome for cron tasks (#2278) chore: update node.js (#2270) chore: push auto-generated files directly instead of using PRs (#2275) fix(ci): allocate more memory to fix test_vscode MONGOSH-1892 (#2239) chore: update auto-generated files (#2276) feat(shell-api): add options in stream processor start, stop, and drop MONGOSH-1920 (#2274) chore: update auto-generated files (#2273) chore: update auto-generated files (#2272) fix: include nonce in oidc request by default MONGOSH-1905 MONGOSH-1917 (#2269) chore(ci): filter for explictily set variants in unit tests (#2271) chore: update auto-generated files (#2268) ...
2 parents 0c60796 + 9b2fd8d commit 3f62f0c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+6194
-6882
lines changed

.evergreen.yml

Lines changed: 5239 additions & 6495 deletions
Large diffs are not rendered by default.

.evergreen/compile-artifact.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if [ `uname` = Darwin ]; then
2626
# match what Node.js 20 does on their own builder machines
2727
export CFLAGS='-mmacosx-version-min=10.15'
2828
export CXXFLAGS='-mmacosx-version-min=10.15'
29+
export MACOSX_DEPLOYMENT_TARGET=10.15
2930
fi
3031

3132
# The CI machines we have for Windows and x64 macOS are not
@@ -73,7 +74,7 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then
7374
export LD_LIBRARY_PATH=/tmp/m/opt/lib
7475
fi
7576

76-
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
77+
export PUPPETEER_SKIP_DOWNLOAD="true"
7778
npm run evergreen-release compile
7879
dist/mongosh --version
7980
dist/mongosh --build-info
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
DOCKER_HUB_URL="https://index.docker.io/v1/"
6+
7+
STDIN=$(cat)
8+
9+
ACTION="$1"
10+
11+
case "$ACTION" in
12+
get)
13+
SERVER_URL="$STDIN"
14+
15+
if [[ "$SERVER_URL" == "$DOCKER_HUB_URL" ]]; then
16+
if [[ -z "${DOCKERHUB_USERNAME:-}" || -z "${DOCKERHUB_PASSWORD:-}" ]]; then
17+
echo "Error: DOCKERHUB_USERNAME or DOCKERHUB_PASSWORD environment variables are not set." >&2
18+
exit 1
19+
fi
20+
21+
echo "{\"Username\": \"$DOCKERHUB_USERNAME\", \"Secret\": \"$DOCKERHUB_PASSWORD\"}"
22+
else
23+
echo "Error: No credentials available for $SERVER_URL" >&2
24+
exit 1
25+
fi
26+
;;
27+
28+
*)
29+
echo "Unsupported action: $ACTION" >&2
30+
exit 1
31+
;;
32+
esac
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"auths": {
3+
"https://index.docker.io/v1/": {}
4+
},
5+
"credsStore": "from-env"
6+
}

0 commit comments

Comments
 (0)