Skip to content

Commit 08458e5

Browse files
committed
CDRIVER-3573 hardcode version for abi check
1 parent 9099f8f commit 08458e5

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

.evergreen/abi-compliance-check.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ mkdir abi-compliance/dumps
1111
# build the current changes
1212
export SKIP_MOCK_TESTS=ON
1313
export EXTRA_CONFIGURE_FLAGS="-DCMAKE_INSTALL_PREFIX=./abi-compliance/changes-install -DCMAKE_C_FLAGS=-g -Og"
14-
python build/calc_release_version.py > VERSION_CURRENT
15-
python build/calc_release_version.py -p > VERSION_RELEASED
14+
# TODO CDRIVER-3573: calculate this dynamically once calc_release_version.py works with non-master non-release branches
15+
echo "1.17.0-pre" > VERSION_CURRENT
16+
echo "1.16.2" > VERSION_RELEASED
1617
sh .evergreen/compile.sh
1718
make install
1819

.evergreen/config.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,19 @@ functions:
235235
abi report:
236236
- command: shell.exec
237237
params:
238-
silent: true
239238
working_dir: mongoc
240239
shell: bash
241240
script: |-
242241
set -o errexit
242+
set -o xtrace
243243
sh .evergreen/abi-compliance-check.sh
244+
- command: shell.exec
245+
params:
246+
silent: true
247+
working_dir: mongoc
248+
shell: bash
249+
script: |-
250+
set -o errexit
244251
export AWS_ACCESS_KEY_ID=${aws_key}
245252
export AWS_SECRET_ACCESS_KEY=${aws_secret}
246253
aws s3 cp abi-compliance/compat_reports s3://mciuploads/${project}/${build_variant}/${revision}/${version_id}/${build_id}/abi-compliance/compat_reports --recursive --acl public-read --region us-east-1

build/evergreen_config_lib/functions.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@
170170
('abi report', Function(
171171
shell_mongoc(r'''
172172
sh .evergreen/abi-compliance-check.sh
173-
173+
''', test=False, xtrace=True),
174+
shell_mongoc(r'''
174175
export AWS_ACCESS_KEY_ID=${aws_key}
175176
export AWS_SECRET_ACCESS_KEY=${aws_secret}
176177
aws s3 cp abi-compliance/compat_reports s3://mciuploads/${project}/%s/abi-compliance/compat_reports --recursive --acl public-read --region us-east-1
@@ -180,7 +181,7 @@
180181
else
181182
exit 0
182183
fi
183-
''' % (build_path,), test=False, silent=True, xtrace=False),
184+
''' % (build_path,), silent=True, test=False, xtrace=False),
184185
s3_put(build_path + '/abi-compliance/compat_report.html',
185186
aws_key='${aws_key}', aws_secret='${aws_secret}',
186187
local_files_include_filter='mongoc/abi-compliance/compat_reports/**/*.html',

0 commit comments

Comments
 (0)