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

Merge main into feature/websockets. #3994

Conversation

LarryOsterman
Copy link
Member

@LarryOsterman LarryOsterman commented Oct 4, 2022

Merge "main" into feature/websockets.

This pull request merges all current changes in main with the feature/websockets branch.

There is no new functionality included in this PR, just merges of changes to bring all the commits in main into the websockets feature branch.

gearama and others added 30 commits July 13, 2022 13:11
* 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
… required. (Azure#3830)

* Update attestation core vcpkg dependency to latest GA version that is required.

* Update vcpkg config.cmake to match the dependency version needed.
* remove refs to winhttp

* this tsst only curl
* 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]>
* Add language-service to list of valid sample slugs

* Update link to taxonomies

Co-authored-by: Heath Stewart <[email protected]>
* 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 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
* 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]>
* 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 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
…re#3851)

This reverts commit 7605ead00308dd20f20f2afe5acc4ec9900a2c47.

Co-authored-by: Ben Broderick Phillips <[email protected]>
* 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]>
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.
* Add link checking for stress CI

* Remove region segment from stress testing links

Co-authored-by: Ben Broderick Phillips <[email protected]>
* Core August releases

* cspell

Co-authored-by: Anton Kolesnyk <[email protected]>
* Increment package version after release of azure-core

* Increment package version after release of azure-core-tracing-opentelemetry
* Condition added and indentation changes
* updating pfx and cert
* update the targeted version of the proxy as well

Co-authored-by: scbedd <[email protected]>
* Storage August Preview Release

* update versions
@LarryOsterman LarryOsterman changed the title Merge main with feature/websockets. Merge main into feature/websockets. Oct 4, 2022
Copy link
Member

@RickWinter RickWinter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Storage and KeyVault looked to be accept theirs?

@LarryOsterman
Copy link
Member Author

The Storage and KeyVault looked to be accept theirs?

Pretty much everything was accept theirs, except for the ci.yml file, the cmakelists.txt files, and a couple of others.

@LarryOsterman LarryOsterman enabled auto-merge (squash) October 5, 2022 19:19
@LarryOsterman
Copy link
Member Author

/check-enforcer evaluate

@LarryOsterman
Copy link
Member Author

/check-enforcer reset

@LarryOsterman
Copy link
Member Author

/check-enforcer override

Copy link
Member

@ahsonkhan ahsonkhan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skimmed through most of the azure-core changes, which look good. But largely rubber stamping :)

@danieljurek
Copy link
Member

/check-enforcer override

1 similar comment
@LarryOsterman
Copy link
Member Author

/check-enforcer override

@benbp benbp disabled auto-merge October 5, 2022 21:19
@LarryOsterman LarryOsterman merged commit b8330a1 into Azure:feature/websockets Oct 5, 2022
@LarryOsterman LarryOsterman deleted the larryo/mergemaintowebsockets branch October 5, 2022 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.