@@ -46,10 +46,7 @@ functions:
46
46
CURRENT_VERSION=latest
47
47
fi
48
48
49
- if [ "${BUILD_TARGET}" = "release" ]; then
50
- PACKAGE_VERSION=$(bash ./evergreen/get-version.sh)
51
- fi
52
-
49
+ PACKAGE_VERSION=$(bash ./evergreen/get-version.sh)
53
50
export DOTNET_SDK_PATH="$(pwd)/../.dotnet"
54
51
export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
55
52
@@ -925,6 +922,7 @@ functions:
925
922
build-packages :
926
923
- command : shell.exec
927
924
params :
925
+ shell : bash
928
926
working_dir : mongo-csharp-driver
929
927
script : |
930
928
${PREPARE_SHELL}
@@ -933,6 +931,7 @@ functions:
933
931
push-packages :
934
932
- command : shell.exec
935
933
params :
934
+ shell : bash
936
935
working_dir : mongo-csharp-driver
937
936
env :
938
937
PACKAGES_SOURCE : ${PACKAGES_SOURCE}
@@ -941,40 +940,90 @@ functions:
941
940
${PREPARE_SHELL}
942
941
. ./evergreen/push-packages.sh
943
942
944
- upload-package :
943
+ upload-packages :
945
944
- command : s3.put
946
945
params :
947
946
aws_key : ${aws_key}
948
947
aws_secret : ${aws_secret}
949
- local_file : mongo-csharp-driver/artifacts/nuget/${PACKAGE_ID}.${PACKAGE_VERSION}.nupkg
950
- remote_file : ${UPLOAD_BUCKET}/${revision}/${PACKAGE_ID}.${PACKAGE_VERSION}.nupkg
948
+ local_files_include_filter :
949
+ - mongo-csharp-driver/artifacts/nuget/*.${PACKAGE_VERSION}.nupkg
950
+ - mongo-csharp-driver/artifacts/nuget/*.${PACKAGE_VERSION}.snupkg
951
+ remote_file : ${UPLOAD_BUCKET}/${revision}/
952
+ preserve_path : false
951
953
bucket : mciuploads
952
954
permissions : public-read
953
955
content_type : ${content_type|application/octet-stream}
954
- - command : s3.put
956
+
957
+ download-packages :
958
+ - command : s3.get
955
959
params :
956
960
aws_key : ${aws_key}
957
961
aws_secret : ${aws_secret}
958
- local_file : mongo-csharp-driver/artifacts/nuget/${PACKAGE_ID}.${PACKAGE_VERSION}.snupkg
959
- remote_file : ${UPLOAD_BUCKET}/${revision}/${PACKAGE_ID}.${PACKAGE_VERSION}.snupkg
962
+ local_file : mongo-csharp-driver/artifacts/nuget/MongoDB.Bson.${PACKAGE_VERSION}.nupkg
963
+ remote_file : ${UPLOAD_BUCKET}/${revision}/MongoDB.Bson.${PACKAGE_VERSION}.nupkg
964
+ bucket : mciuploads
965
+ - command : s3.get
966
+ params :
967
+ aws_key : ${aws_key}
968
+ aws_secret : ${aws_secret}
969
+ local_file : mongo-csharp-driver/artifacts/nuget/MongoDB.Bson.${PACKAGE_VERSION}.snupkg
970
+ remote_file : ${UPLOAD_BUCKET}/${revision}/MongoDB.Bson.${PACKAGE_VERSION}.snupkg
971
+ bucket : mciuploads
972
+ - command : s3.get
973
+ params :
974
+ aws_key : ${aws_key}
975
+ aws_secret : ${aws_secret}
976
+ local_file : mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.${PACKAGE_VERSION}.nupkg
977
+ remote_file : ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.${PACKAGE_VERSION}.nupkg
978
+ bucket : mciuploads
979
+ - command : s3.get
980
+ params :
981
+ aws_key : ${aws_key}
982
+ aws_secret : ${aws_secret}
983
+ local_file : mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.${PACKAGE_VERSION}.snupkg
984
+ remote_file : ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.${PACKAGE_VERSION}.snupkg
985
+ bucket : mciuploads
986
+ - command : s3.get
987
+ params :
988
+ aws_key : ${aws_key}
989
+ aws_secret : ${aws_secret}
990
+ local_file : mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Core.${PACKAGE_VERSION}.nupkg
991
+ remote_file : ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Core.${PACKAGE_VERSION}.nupkg
992
+ bucket : mciuploads
993
+ - command : s3.get
994
+ params :
995
+ aws_key : ${aws_key}
996
+ aws_secret : ${aws_secret}
997
+ local_file : mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Core.${PACKAGE_VERSION}.snupkg
998
+ remote_file : ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Core.${PACKAGE_VERSION}.snupkg
999
+ bucket : mciuploads
1000
+ - command : s3.get
1001
+ params :
1002
+ aws_key : ${aws_key}
1003
+ aws_secret : ${aws_secret}
1004
+ local_file : mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.GridFS.${PACKAGE_VERSION}.nupkg
1005
+ remote_file : ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.GridFS.${PACKAGE_VERSION}.nupkg
1006
+ bucket : mciuploads
1007
+ - command : s3.get
1008
+ params :
1009
+ aws_key : ${aws_key}
1010
+ aws_secret : ${aws_secret}
1011
+ local_file : mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.GridFS.${PACKAGE_VERSION}.snupkg
1012
+ remote_file : ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.GridFS.${PACKAGE_VERSION}.snupkg
960
1013
bucket : mciuploads
961
- permissions : public-read
962
- content_type : ${content_type|application/octet-stream}
963
-
964
- download-package :
965
1014
- command : s3.get
966
1015
params :
967
1016
aws_key : ${aws_key}
968
1017
aws_secret : ${aws_secret}
969
- local_file : mongo-csharp-driver/artifacts/nuget/${PACKAGE_ID} .${PACKAGE_VERSION}.nupkg
970
- remote_file : ${UPLOAD_BUCKET}/${revision}/${PACKAGE_ID} .${PACKAGE_VERSION}.nupkg
1018
+ local_file : mongo-csharp-driver/artifacts/nuget/mongocsharpdriver .${PACKAGE_VERSION}.nupkg
1019
+ remote_file : ${UPLOAD_BUCKET}/${revision}/mongocsharpdriver .${PACKAGE_VERSION}.nupkg
971
1020
bucket : mciuploads
972
1021
- command : s3.get
973
1022
params :
974
1023
aws_key : ${aws_key}
975
1024
aws_secret : ${aws_secret}
976
- local_file : mongo-csharp-driver/artifacts/nuget/${PACKAGE_ID} .${PACKAGE_VERSION}.snupkg
977
- remote_file : ${UPLOAD_BUCKET}/${revision}/${PACKAGE_ID} .${PACKAGE_VERSION}.snupkg
1025
+ local_file : mongo-csharp-driver/artifacts/nuget/mongocsharpdriver .${PACKAGE_VERSION}.snupkg
1026
+ remote_file : ${UPLOAD_BUCKET}/${revision}/mongocsharpdriver .${PACKAGE_VERSION}.snupkg
978
1027
bucket : mciuploads
979
1028
980
1029
build-apidocs :
@@ -984,10 +1033,6 @@ functions:
984
1033
working_dir : mongo-csharp-driver
985
1034
script : |
986
1035
${PREPARE_SHELL}
987
- if ! [[ "$PACKAGE_VERSION" =~ ^[0-9]+\.[0-9]+\.0$ ]]; then
988
- echo "Skip api docs generating for the patch release"
989
- exit 0
990
- fi
991
1036
./evergreen/build-apidocs.sh
992
1037
993
1038
upload-apidocs :
@@ -1001,7 +1046,7 @@ functions:
1001
1046
script : |
1002
1047
${PREPARE_SHELL}
1003
1048
if ! [[ "$PACKAGE_VERSION" =~ ^[0-9]+\.[0-9]+\.0$ ]]; then
1004
- echo "Skip api docs generating for the patch release"
1049
+ echo "Cannot upload api docs for the patch release"
1005
1050
exit 0
1006
1051
fi
1007
1052
./evergreen/upload-apidocs.sh
@@ -1721,51 +1766,37 @@ tasks:
1721
1766
commands :
1722
1767
- func : install-dotnet
1723
1768
- func : build-packages
1724
- - func : upload-package
1725
- vars :
1726
- PACKAGE_ID : " MongoDB.Bson"
1727
- - func : upload-package
1728
- vars :
1729
- PACKAGE_ID : " MongoDB.Driver"
1730
- - func : upload-package
1731
- vars :
1732
- PACKAGE_ID : " MongoDB.Driver.Core"
1733
- - func : upload-package
1734
- vars :
1735
- PACKAGE_ID : " MongoDB.Driver.GridFS"
1736
- - func : upload-package
1737
- vars :
1738
- PACKAGE_ID : " mongocsharpdriver"
1769
+ - func : upload-packages
1739
1770
1740
- - name : push-packages
1771
+ - name : push-packages-nuget
1741
1772
commands :
1742
1773
- func : install-dotnet
1743
- - func : download-package
1744
- vars :
1745
- PACKAGE_ID : " MongoDB.Bson"
1746
- - func : download-package
1747
- vars :
1748
- PACKAGE_ID : " MongoDB.Driver"
1749
- - func : download-package
1750
- vars :
1751
- PACKAGE_ID : " MongoDB.Driver.Core"
1752
- - func : download-package
1753
- vars :
1754
- PACKAGE_ID : " MongoDB.Driver.GridFS"
1755
- - func : download-package
1756
- vars :
1757
- PACKAGE_ID : " mongocsharpdriver"
1774
+ - func : download-packages
1758
1775
- func : push-packages
1759
1776
vars :
1760
1777
PACKAGES_SOURCE : " https://api.nuget.org/v3/index.json"
1761
1778
PACKAGES_SOURCE_KEY : ${nuget_api_key}
1762
1779
1780
+ - name : push-packages-myget
1781
+ commands :
1782
+ - func : install-dotnet
1783
+ - func : download-packages
1784
+ - func : push-packages
1785
+ vars :
1786
+ PACKAGES_SOURCE : " https://www.myget.org/F/mongodb/api/v3/index.json"
1787
+ PACKAGES_SOURCE_KEY : ${myget_api_key}
1788
+
1763
1789
- name : generate-apidocs
1764
1790
commands :
1765
1791
- func : install-dotnet
1766
1792
- func : build-apidocs
1767
1793
- func : upload-apidocs
1768
1794
1795
+ - name : validate-apidocs
1796
+ commands :
1797
+ - func : install-dotnet
1798
+ - func : build-apidocs
1799
+
1769
1800
axes :
1770
1801
- id : version
1771
1802
display_name : MongoDB Version
@@ -1933,18 +1964,6 @@ axes:
1933
1964
variables :
1934
1965
VAULT_NAME : " serverless_next"
1935
1966
1936
- - id : build-target
1937
- display_name : CI build target
1938
- values :
1939
- - id : " tests"
1940
- display_name : " tests"
1941
- variables :
1942
- BUILD_TARGET : " tests"
1943
- - id : " release"
1944
- display_name : " release"
1945
- variables :
1946
- BUILD_TARGET : " release"
1947
-
1948
1967
task_groups :
1949
1968
- name : testazurekms-task-group
1950
1969
setup_group_can_fail_task : true
@@ -2569,18 +2588,23 @@ buildvariants:
2569
2588
# Package release variants
2570
2589
- matrix_name : build-packages
2571
2590
matrix_spec :
2572
- build-target : " release"
2573
2591
os : " windows-64" # should produce package on Windows to make sure full framework binaries created.
2574
- display_name : " Package Pack"
2592
+ display_name : " Packages Pack"
2575
2593
tags : ["build-packages", "release-tag"]
2576
2594
tasks :
2577
2595
- name : build-packages
2578
- git_tag_only : true
2579
2596
priority : 10
2580
2597
2598
+ - matrix_name : validate-apidocs
2599
+ matrix_spec :
2600
+ os : " ubuntu-2004"
2601
+ display_name : " Validate API Documentation generation"
2602
+ tags : ["build-apidocs"]
2603
+ tasks :
2604
+ - name : validate-apidocs
2605
+
2581
2606
- matrix_name : generate-apidocs
2582
2607
matrix_spec :
2583
- build-target : " release"
2584
2608
os : " ubuntu-2004"
2585
2609
display_name : " Generate API Documentation"
2586
2610
tags : ["build-apidocs", "release-tag"]
@@ -2593,17 +2617,28 @@ buildvariants:
2593
2617
variant : " .build-packages"
2594
2618
# # add dependency onto packages smoke test once it implemented
2595
2619
2596
- - matrix_name : push-packages
2620
+ - matrix_name : push-packages-nuget
2597
2621
matrix_spec :
2598
- build-target : " release"
2599
2622
os : " ubuntu-2004"
2600
- display_name : " Package Push"
2623
+ display_name : " Packages Push (NuGet) "
2601
2624
tags : ["push-packages", "release-tag"]
2602
2625
tasks :
2603
- - name : push-packages
2626
+ - name : push-packages-nuget
2604
2627
git_tag_only : true
2605
2628
priority : 10
2606
2629
depends_on :
2607
2630
- name : build-packages
2608
2631
variant : " .build-packages"
2609
2632
# # add dependency onto packages smoke test once it implemented
2633
+
2634
+ - matrix_name : push-packages-myget
2635
+ matrix_spec :
2636
+ os : " ubuntu-2004"
2637
+ display_name : " Packages Push (MyGet)"
2638
+ tags : ["push-packages-myget"]
2639
+ tasks :
2640
+ - name : push-packages-myget
2641
+ depends_on :
2642
+ - name : build-packages
2643
+ variant : " .build-packages"
2644
+ # # add dependency onto packages smoke test once it implemented
0 commit comments