Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the feature/websockets branch with changes from main #3903

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e0706ba
Stress test (#3820)
gearama Jul 13, 2022
a3926d6
Fixed the metadata for better handling (#3824)
azure-sdk Jul 13, 2022
593437b
Update attestation core vcpkg dependency to latest GA version that is…
ahsonkhan Jul 15, 2022
7bf6735
Remove winhttp (#3832)
gearama Jul 15, 2022
73bb61d
Move perf.yml to eng/common (#3833)
azure-sdk Jul 15, 2022
cff96f8
Sync eng/common directory with azure-sdk-tools for PR 3656 (#3834)
azure-sdk Jul 15, 2022
c3ecbcd
Update casing for 'verison' (#3821)
azure-sdk Jul 19, 2022
b95cdcf
Print additional result summary formats to pipelines UI (#3842)
azure-sdk Jul 19, 2022
584f83c
Sync eng/common directory with azure-sdk-tools for PR 3702 (#3843)
azure-sdk Jul 20, 2022
6c74e57
Fix incorrect failure notification in vcpkg publishing (#3838)
danieljurek Jul 21, 2022
992a3a9
Helm charts (#3841)
gearama Jul 25, 2022
8cb8a43
Sync eng/common directory with azure-sdk-tools for PR 3661 (#3846)
azure-sdk Jul 25, 2022
ea2d3ad
Sync eng/common directory with azure-sdk-tools for PR 3735 (#3845)
azure-sdk Jul 25, 2022
a75c95b
Increment version for keyvault releases (#3809)
azure-sdk Jul 25, 2022
c437f5a
Removed hard dependency on opentelemetry version (#3844)
LarryOsterman Jul 26, 2022
209dcae
Revert "Add full clone fallback to sparse checkout (#3661)" (#3851)
azure-sdk Jul 26, 2022
f2efced
Sync eng/common directory with azure-sdk-tools for PR 3753 (#3857)
azure-sdk Jul 27, 2022
9843c71
Bump macOs version to macos-11 (#3853)
sima-zhu Jul 28, 2022
1dab2c1
Update CHANGELOG.md
RickWinter Jul 28, 2022
9eae0df
Fix misleading step name in az module install (#3859)
azure-sdk Jul 29, 2022
86b3305
Retry poll calls on EINTR (#3858)
johnwheffner Aug 1, 2022
9a04638
Fix bad path to sample matrix json (#3860)
azure-sdk Aug 2, 2022
e8906ca
Sync eng/common directory with azure-sdk-tools for PR 3826 (#3863)
azure-sdk Aug 3, 2022
755d717
Core August releases (#3862)
antkmsft Aug 4, 2022
5a8d623
Increment version for core releases (#3865)
azure-sdk Aug 4, 2022
5411134
Storage Aug GA release (#3864)
Jinming-Hu Aug 5, 2022
bf65862
CG only runs on internal (#3866)
JonathanCrd Aug 5, 2022
93991ab
STG 79 80 81 Features (#3850)
Jinming-Hu Aug 5, 2022
5954ef7
Sync eng/common directory with azure-sdk-tools for PR 3860 (#3871)
azure-sdk Aug 5, 2022
1f82325
Storage August Preview Release (#3868)
Jinming-Hu Aug 9, 2022
b5c456c
Increment version for storage releases (#3875)
azure-sdk Aug 9, 2022
e019b3e
Fix an issue that reason phrase is missing as expected from HTTP/2 se…
keshen-msft Aug 10, 2022
c152c05
Update CODEOWNERS (#3881)
microzchang Aug 11, 2022
82d4446
updated targeted proxy version to one that properly allows consumptio…
azure-sdk Aug 15, 2022
2dd3dbe
Fix `azure-storage-blobs-cpp` beta install (#3889)
antkmsft Aug 17, 2022
634df13
Fixed #3899 - Handle new OSX version correctly; reformatted platform-…
LarryOsterman Aug 24, 2022
f8c41df
Simpler get-binarysizes check for OSX (#3901)
LarryOsterman Aug 24, 2022
50152b0
Merge branch 'main' into updatewebsocketswithmain
LarryOsterman Aug 24, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"matrix": {
"CmakeEnvArg": "",
"OSConfig": {
"Linux": {
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
"OSVmImage": "MMSUbuntu18.04",
"AptDependencies": "libcurl4-openssl-dev",
"VCPKG_DEFAULT_TRIPLET": "x64-linux"
},
"Windows": {
"Pool": "azsdk-pool-mms-win-2019-general",
"OSVmImage": "MMS2019",
"VCPKG_DEFAULT_TRIPLET": "x64-windows"
},
"Mac": {
"Pool": "Azure Pipelines",
"OSVmImage": "macos-11",
"VCPKG_DEFAULT_TRIPLET": "x64-osx"
}
}
"matrix": {
"CmakeEnvArg": "",
"OSConfig": {
"Linux": {
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
"OSVmImage": "MMSUbuntu18.04",
"AptDependencies": "libcurl4-openssl-dev",
"VCPKG_DEFAULT_TRIPLET": "x64-linux"
},
"Windows": {
"Pool": "azsdk-pool-mms-win-2019-general",
"OSVmImage": "MMS2019",
"VCPKG_DEFAULT_TRIPLET": "x64-windows"
},
"Mac": {
"Pool": "Azure Pipelines",
"OSVmImage": "macos-11",
"VCPKG_DEFAULT_TRIPLET": "x64-osx"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"matrix": {
"OSConfig": {
"Windows": {
"Pool": "azsdk-pool-mms-win-2019-general",
"OSVmImage": "MMS2019",
"CmakeEnvArg": ""
},
"Linux": {
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
"OSVmImage": "MMSUbuntu18.04",
"CmakeEnvArg": "",
"AptDependencies": "libcurl4-openssl-dev"
},
"Mac": {
"Pool": "Azure Pipelines",
"OSVmImage": "macos-11",
"CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ",
"BrewDependencies": "openssl"
}
}
"matrix": {
"OSConfig": {
"Windows": {
"Pool": "azsdk-pool-mms-win-2019-general",
"OSVmImage": "MMS2019",
"CmakeEnvArg": ""
},
"Linux": {
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
"OSVmImage": "MMSUbuntu18.04",
"CmakeEnvArg": "",
"AptDependencies": "libcurl4-openssl-dev"
},
"Mac": {
"Pool": "Azure Pipelines",
"OSVmImage": "macos-11",
"CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ",
"BrewDependencies": "openssl"
}
}
}
}
8 changes: 4 additions & 4 deletions eng/scripts/Get-BinarySizes.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function setEnvVar($key, $value) {
}

function getTargetOs {
if ($OsVMImage.StartsWith('macOS', $true, (Get-Culture).InvariantCulture)) {
if ($OsVMImage -like 'macOS*') {
return $OsVMImage
}

Expand All @@ -64,7 +64,7 @@ function getTargetOs {
}

function getTargetArchitecture {
if ($OSVmImage.StartsWith('macOS', $true, (Get-Culture).InvariantCulture)) {
if ($OSVmImage -like 'macOS*') {
return "x64"
}

Expand All @@ -81,7 +81,7 @@ function getTargetArchitecture {
}

function getToolChain {
if ($OSVmImage.StartsWith('macOS', $true, (Get-Culture).InvariantCulture)) {
if ($OSVmImage -like 'macOS*') {
return "AppleClang 12"
}

Expand Down Expand Up @@ -109,7 +109,7 @@ function getToolChain {
}

function getTargetPlatform {
if ($OSVmImage.StartsWith('macOS', $true, (Get-Culture).InvariantCulture)) {
if ($OSVmImage -like 'macOS*') {
return "macos"
}

Expand Down