Skip to content

Commit bc5bd56

Browse files
committed
Also respect shebang in EVG direct script invocations
1 parent 51900d3 commit bc5bd56

File tree

1 file changed

+17
-40
lines changed

1 file changed

+17
-40
lines changed

.mci.yml

Lines changed: 17 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,11 @@ functions:
6060
- command: subprocess.exec
6161
type: setup
6262
params:
63-
binary: bash
64-
args: [mongo-cxx-driver/.evergreen/abi-compliance-check-setup.sh]
63+
binary: mongo-cxx-driver/.evergreen/abi-compliance-check-setup.sh
6564
- command: subprocess.exec
6665
type: test
6766
params:
68-
binary: bash
69-
args: [mongo-cxx-driver/.evergreen/abi-compliance-check-test.sh]
67+
binary: mongo-cxx-driver/.evergreen/abi-compliance-check-test.sh
7068
- command: s3.put
7169
type: system
7270
params:
@@ -116,13 +114,11 @@ functions:
116114
- command: subprocess.exec
117115
type: setup
118116
params:
119-
binary: bash
120-
args: [mongo-cxx-driver/.evergreen/abidiff-setup.sh]
117+
binary: mongo-cxx-driver/.evergreen/abidiff-setup.sh
121118
- command: subprocess.exec
122119
type: test
123120
params:
124-
binary: bash
125-
args: [mongo-cxx-driver/.evergreen/abidiff-test.sh]
121+
binary: mongo-cxx-driver/.evergreen/abidiff-test.sh
126122
- command: s3.put
127123
type: system
128124
params:
@@ -150,8 +146,7 @@ functions:
150146
- command: subprocess.exec
151147
type: test
152148
params:
153-
binary: bash
154-
args: [mongo-cxx-driver/.evergreen/abi-prohibited-symbols-test.sh]
149+
binary: mongo-cxx-driver/.evergreen/abi-prohibited-symbols-test.sh
155150

156151
"setup":
157152
- command: shell.exec
@@ -250,7 +245,6 @@ functions:
250245
- command: shell.exec
251246
params:
252247
shell: bash
253-
working_dir: "."
254248
script: |
255249
set -o errexit
256250
set -o pipefail
@@ -338,7 +332,6 @@ functions:
338332
command: subprocess.exec
339333
params:
340334
binary: bash
341-
working_dir: "."
342335
args:
343336
- -c
344337
- |
@@ -358,20 +351,18 @@ functions:
358351
updates:
359352
- key: mongoc_version_minimum
360353
value: *mongoc_version_minimum
361-
- command: shell.exec
354+
- command: subprocess.exec
362355
type: setup
363356
params:
364-
shell: bash
357+
binary: mongo-cxx-driver/.evergreen/install_c_driver.sh
365358
add_expansions_to_env: true
366-
script: mongo-cxx-driver/.evergreen/install_c_driver.sh
367359

368360
# fetch_c_driver_source may be used to fetch the C driver source without installing the C driver.
369361
# This can be used when only CI scripts are needed.
370362
"fetch_c_driver_source":
371363
- command: shell.exec
372364
params:
373365
shell: bash
374-
working_dir: "."
375366
script: |
376367
set -o errexit
377368
set -o pipefail
@@ -610,9 +601,8 @@ functions:
610601
"upload code coverage":
611602
- command: subprocess.exec
612603
params:
613-
binary: bash
604+
binary: .evergreen/upload-code-coverage.sh
614605
working_dir: "mongo-cxx-driver"
615-
args: [-c, .evergreen/upload-code-coverage.sh]
616606
include_expansions_in_env: [codecov_token]
617607

618608
"docker-image-build":
@@ -634,18 +624,16 @@ functions:
634624
make -C extras/docker/noble nocachebuild test
635625
636626
"run benchmarks":
637-
- command: shell.exec
627+
- command: subprocess.exec
638628
type: setup
639629
params:
640-
shell: bash
630+
binary: ./etc/microbenchmark-test-data.sh
641631
working_dir: "mongo-cxx-driver"
642-
script: ./etc/microbenchmark-test-data.sh
643-
- command: shell.exec
632+
- command: subprocess.exec
644633
type: test
645634
params:
646-
shell: bash
635+
binary: ./build/benchmark/microbenchmarks all
647636
working_dir: "mongo-cxx-driver"
648-
script: ./build/benchmark/microbenchmarks all
649637
- command: perf.send
650638
params:
651639
name: perf
@@ -655,13 +643,10 @@ functions:
655643
- command: subprocess.exec
656644
type: test
657645
params:
658-
binary: bash
646+
binary: .evergreen/compile-scan-build.sh
659647
working_dir: "mongo-cxx-driver"
660648
add_expansions_to_env: true
661649
redirect_standard_error_to_output: true
662-
args:
663-
- -c
664-
- .evergreen/compile-scan-build.sh
665650

666651
"upload scan artifacts":
667652
- command: subprocess.exec
@@ -705,15 +690,12 @@ functions:
705690
type: test
706691
params:
707692
working_dir: "mongo-cxx-driver"
708-
binary: bash
693+
binary: .evergreen/check-augmented-sbom.sh
709694
include_expansions_in_env:
710695
- ARTIFACTORY_USER
711696
- ARTIFACTORY_PASSWORD
712697
- SILK_CLIENT_ID
713698
- SILK_CLIENT_SECRET
714-
args:
715-
- -c
716-
- .evergreen/check-augmented-sbom.sh
717699

718700
"upload augmented sbom":
719701
- command: s3.put
@@ -1286,8 +1268,7 @@ task_groups:
12861268
- func: install_c_driver
12871269
- command: subprocess.exec
12881270
params:
1289-
binary: bash
1290-
args: [mongo-cxx-driver/.evergreen/abi-stability-setup.sh]
1271+
binary: mongo-cxx-driver/.evergreen/abi-stability-setup.sh
12911272
include_expansions_in_env: [cxx_standard]
12921273
tasks: [".abi-stability"]
12931274
teardown_task_can_fail_task: true
@@ -1304,12 +1285,10 @@ task_groups:
13041285
- command: subprocess.exec
13051286
params:
13061287
working_dir: mongo-cxx-driver
1307-
binary: bash
1288+
binary: ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
13081289
add_expansions_to_env: true
13091290
env:
13101291
MONGODB_VERSION: '7.0'
1311-
args:
1312-
- ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
13131292
- command: expansions.update
13141293
# Expected to set MONGODB_URI expansion.
13151294
params:
@@ -1318,10 +1297,8 @@ task_groups:
13181297
- command: subprocess.exec
13191298
params:
13201299
working_dir: mongo-cxx-driver
1321-
binary: bash
1300+
binary: ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
13221301
add_expansions_to_env: true
1323-
args:
1324-
- ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
13251302
setup_group_can_fail_task: true
13261303
setup_group_timeout_secs: 1800
13271304
tasks:

0 commit comments

Comments
 (0)