Skip to content

Commit bcf83a4

Browse files
LarryOstermangearamaazure-sdksima-zhuahsonkhan
authored
Update the feature/websockets branch with changes from main (#3903)
* Stress test (#3820) * mem leak fix * PR comments fix * PR comments * seems to work? * clang * curl again * add first stress test * also update gitignore * missing line * only linux * clang typo format * typo 2 * PR comments * cspell * remove terminator * Fixed the metadata for better handling (#3824) Co-authored-by: sima-zhu <[email protected]> * Update attestation core vcpkg dependency to latest GA version that is required. (#3830) * Update attestation core vcpkg dependency to latest GA version that is required. * Update vcpkg config.cmake to match the dependency version needed. * Remove winhttp (#3832) * remove refs to winhttp * this tsst only curl * Move perf.yml to eng/common (#3833) Co-authored-by: Mike Harder <[email protected]> * Sync eng/common directory with azure-sdk-tools for PR 3656 (#3834) * someone wants to reference the test-proxy startup scripts externally. to make this easy on them we're parameterizing the root of the eng/common for easy use in that scenario * two leading $ signs on the definition of the certificate path was causing some issues! Co-authored-by: scbedd <[email protected]> * Update casing for 'verison' (#3821) Co-authored-by: Daniel Jurek <[email protected]> * Print additional result summary formats to pipelines UI (#3842) Co-authored-by: Mike Harder <[email protected]> * Sync eng/common directory with azure-sdk-tools for PR 3702 (#3843) * Add language-service to list of valid sample slugs * Update link to taxonomies Co-authored-by: Heath Stewart <[email protected]> * Fix incorrect failure notification in vcpkg publishing (#3838) * Set up for testing of template pipeline * Override branches, set up for template GA release * More TODOs to prevent merging an unintended change * More removal of TestPipeline * Increment template version number * Use script to set package version * Check out the correct branch * branch parameter in the command * Use $(PublishToVcpkg) to determine if we should check for changes * dictionary syntax * Set GA package version to validate GA publish scenario * Update changelog * create-pull-request.yml optionally pushes changes * Output GH PR URI * Macro syntax with a variable set earlier * Move up to 1.2.0-beta.2 * beta.1 * Revert changelog * Revert testing-related changes * Revert vcpkg-clone.yml * Revert eng/common changes, ensure global $(HasChanges) is set properly * Changes to enable testing * 1.1.0-beta.1 * vcpkg clone should clone at configured branch * Clone "main" branch of vcpkg betas * Undo test-specific changes * More PR cleanup * PR cleanup * Helm charts (#3841) * helm chart * first pipe setup * poi * magiks * ewewe * stress * cleanup * pr * QFE and readme * clang * stupid clang , waste of time * ewqwewewrqrewewrqewrqwrqr * stupid clang * cspell * PR * try try again * clang again * Sync eng/common directory with azure-sdk-tools for PR 3661 (#3846) * Add full clone fallback to sparse checkout * Improve clone handling and overrides for sparse checkout * Use SkipSparseCheckout variable name Co-authored-by: Ben Broderick Phillips <[email protected]> * Sync eng/common directory with azure-sdk-tools for PR 3735 (#3845) * Detect API changes using new snadboxinx approach * Added strictmode * Remove unset variable * Changes as per strict mode 3 * Rervert strict mode to allow language level fixes to merge first Co-authored-by: praveenkuttappan <[email protected]> * Increment version for keyvault releases (#3809) * Increment package version after release of azure-security-keyvault-keys * Increment package version after release of azure-security-keyvault-secrets * Increment package version after release of azure-security-keyvault-certificates * Removed hard dependency on opentelemetry version (#3844) * Revert "Add full clone fallback to sparse checkout (#3661)" (#3851) This reverts commit 7605ead00308dd20f20f2afe5acc4ec9900a2c47. Co-authored-by: Ben Broderick Phillips <[email protected]> * Sync eng/common directory with azure-sdk-tools for PR 3753 (#3857) * Bump MacOs version to macos-11 * Update eng/common/scripts/job-matrix/tests/job-matrix-functions.tests.ps1 Co-authored-by: Wes Haggard <[email protected]> * Update eng/common/scripts/job-matrix/tests/job-matrix-functions.tests.ps1 Co-authored-by: Wes Haggard <[email protected]> Co-authored-by: sima-zhu <[email protected]> Co-authored-by: Sima Zhu <[email protected]> Co-authored-by: Wes Haggard <[email protected]> * Bump macOs version to macos-11 (#3853) * Update CHANGELOG.md * Fix misleading step name in az module install (#3859) Co-authored-by: Ben Broderick Phillips <[email protected]> * Retry poll calls on EINTR (#3858) When signals are delievered to the process, calls here to poll may be interrupted and return with a spurious failure. The call instead should be restarted. * Fix bad path to sample matrix json (#3860) Co-authored-by: Ben Broderick Phillips <[email protected]> * Sync eng/common directory with azure-sdk-tools for PR 3826 (#3863) * Add link checking for stress CI * Remove region segment from stress testing links Co-authored-by: Ben Broderick Phillips <[email protected]> * Core August releases (#3862) * Core August releases * cspell Co-authored-by: Anton Kolesnyk <[email protected]> * Increment version for core releases (#3865) * Increment package version after release of azure-core * Increment package version after release of azure-core-tracing-opentelemetry * Storage Aug GA release (#3864) * CG only runs on internal (#3866) * Condition added and indentation changes * STG 79 80 81 Features (#3850) * Sync eng/common directory with azure-sdk-tools for PR 3860 (#3871) * updating pfx and cert * update the targeted version of the proxy as well Co-authored-by: scbedd <[email protected]> * Storage August Preview Release (#3868) * Storage August Preview Release * update versions * Increment version for storage releases (#3875) * Increment package version after release of azure-storage-common * Increment package version after release of azure-storage-blobs * Fix an issue that reason phrase is missing as expected from HTTP/2 server (#3879) * Fix an issue that reason phrase is missing as expected from HTTP/2 server * reverse the condition * compact comments * fix clang format * Update CODEOWNERS (#3881) * updated targeted proxy version to one that properly allows consumption of TLS certificates (#3888) Co-authored-by: scbedd <[email protected]> * Fix `azure-storage-blobs-cpp` beta install (#3889) Co-authored-by: Anton Kolesnyk <[email protected]> * Fixed #3899 - Handle new OSX version correctly; reformatted platform-matrix JSON files (#3900) * Simpler get-binarysizes check for OSX (#3901) * Simpler get-binarysizes check for OSX * Missed wildcard Co-authored-by: George Arama <[email protected]> Co-authored-by: Azure SDK Bot <[email protected]> Co-authored-by: sima-zhu <[email protected]> Co-authored-by: Ahson Khan <[email protected]> Co-authored-by: Mike Harder <[email protected]> Co-authored-by: scbedd <[email protected]> Co-authored-by: Daniel Jurek <[email protected]> Co-authored-by: Heath Stewart <[email protected]> Co-authored-by: Ben Broderick Phillips <[email protected]> Co-authored-by: praveenkuttappan <[email protected]> Co-authored-by: Ben Broderick Phillips <[email protected]> Co-authored-by: Sima Zhu <[email protected]> Co-authored-by: Wes Haggard <[email protected]> Co-authored-by: Rick Winter <[email protected]> Co-authored-by: John Heffner <[email protected]> Co-authored-by: Anton Kolesnyk <[email protected]> Co-authored-by: Anton Kolesnyk <[email protected]> Co-authored-by: JinmingHu <[email protected]> Co-authored-by: Jonathan Cárdenas <[email protected]> Co-authored-by: keshen-msft <[email protected]> Co-authored-by: microzchang <[email protected]>
1 parent 40cf560 commit bcf83a4

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed
Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
2-
"matrix": {
3-
"CmakeEnvArg": "",
4-
"OSConfig": {
5-
"Linux": {
6-
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
7-
"OSVmImage": "MMSUbuntu18.04",
8-
"AptDependencies": "libcurl4-openssl-dev",
9-
"VCPKG_DEFAULT_TRIPLET": "x64-linux"
10-
},
11-
"Windows": {
12-
"Pool": "azsdk-pool-mms-win-2019-general",
13-
"OSVmImage": "MMS2019",
14-
"VCPKG_DEFAULT_TRIPLET": "x64-windows"
15-
},
16-
"Mac": {
17-
"Pool": "Azure Pipelines",
18-
"OSVmImage": "macos-11",
19-
"VCPKG_DEFAULT_TRIPLET": "x64-osx"
20-
}
21-
}
2+
"matrix": {
3+
"CmakeEnvArg": "",
4+
"OSConfig": {
5+
"Linux": {
6+
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
7+
"OSVmImage": "MMSUbuntu18.04",
8+
"AptDependencies": "libcurl4-openssl-dev",
9+
"VCPKG_DEFAULT_TRIPLET": "x64-linux"
10+
},
11+
"Windows": {
12+
"Pool": "azsdk-pool-mms-win-2019-general",
13+
"OSVmImage": "MMS2019",
14+
"VCPKG_DEFAULT_TRIPLET": "x64-windows"
15+
},
16+
"Mac": {
17+
"Pool": "Azure Pipelines",
18+
"OSVmImage": "macos-11",
19+
"VCPKG_DEFAULT_TRIPLET": "x64-osx"
20+
}
2221
}
22+
}
2323
}
Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
2-
"matrix": {
3-
"OSConfig": {
4-
"Windows": {
5-
"Pool": "azsdk-pool-mms-win-2019-general",
6-
"OSVmImage": "MMS2019",
7-
"CmakeEnvArg": ""
8-
},
9-
"Linux": {
10-
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
11-
"OSVmImage": "MMSUbuntu18.04",
12-
"CmakeEnvArg": "",
13-
"AptDependencies": "libcurl4-openssl-dev"
14-
},
15-
"Mac": {
16-
"Pool": "Azure Pipelines",
17-
"OSVmImage": "macos-11",
18-
"CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ",
19-
"BrewDependencies": "openssl"
20-
}
21-
}
2+
"matrix": {
3+
"OSConfig": {
4+
"Windows": {
5+
"Pool": "azsdk-pool-mms-win-2019-general",
6+
"OSVmImage": "MMS2019",
7+
"CmakeEnvArg": ""
8+
},
9+
"Linux": {
10+
"Pool": "azsdk-pool-mms-ubuntu-1804-general",
11+
"OSVmImage": "MMSUbuntu18.04",
12+
"CmakeEnvArg": "",
13+
"AptDependencies": "libcurl4-openssl-dev"
14+
},
15+
"Mac": {
16+
"Pool": "Azure Pipelines",
17+
"OSVmImage": "macos-11",
18+
"CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ",
19+
"BrewDependencies": "openssl"
20+
}
2221
}
22+
}
2323
}

eng/scripts/Get-BinarySizes.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function setEnvVar($key, $value) {
4141
}
4242

4343
function getTargetOs {
44-
if ($OsVMImage.StartsWith('macOS', $true, (Get-Culture).InvariantCulture)) {
44+
if ($OsVMImage -like 'macOS*') {
4545
return $OsVMImage
4646
}
4747

@@ -64,7 +64,7 @@ function getTargetOs {
6464
}
6565

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

@@ -81,7 +81,7 @@ function getTargetArchitecture {
8181
}
8282

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

@@ -109,7 +109,7 @@ function getToolChain {
109109
}
110110

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

0 commit comments

Comments
 (0)