Skip to content

Merge eng/ from main on assets push #8020

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.

Sign up for GitHub

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

Merged
scbedd merged 13 commits into from
Apr 6, 2024
Merged

Merge eng/ from main on assets push #8020

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8947a5e
ensure we fetch and merge main before pushing a new tag
scbedd Apr 3, 2024
2ad1169
what the heck does fetch merge mean
scbedd Apr 3, 2024
6b565bb
move the merge _after_ the commit
scbedd Apr 3, 2024
d6f3638
ensure that the integration merge also has the correct config settings
scbedd Apr 3, 2024
8a774fa
get rid of 'merge' methodology that was pulling in changes that we DI…
scbedd Apr 3, 2024
833c57d
restore the launch settings
scbedd Apr 3, 2024
9c36546
remove inapplicable comment
scbedd Apr 4, 2024
067b5ae
handle when the patch is no-op
scbedd Apr 4, 2024
76e435c
grab gitignore
scbedd Apr 4, 2024
ba378db
Merge remote-tracking branch 'upstream/main' into feature/merge-main-…
scbedd Apr 4, 2024
f46774c
repair the tests
scbedd Apr 4, 2024
7cfcc91
ensure that the root file properly applies
scbedd Apr 5, 2024
8ce22ac
reset --soft was firing when we were unable to retrieve main properly…
scbedd Apr 5, 2024
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
Prev Previous commit
Next Next commit
repair the tests
  • Loading branch information
@scbedd
scbedd committed Apr 4, 2024
commit f46774ce8dad777b80d4eb5e66c93dea09293532
8 changes: 4 additions & 4 deletions tools/test-proxy/Azure.Sdk.Tools.TestProxy.Tests/GitStoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,10 +438,10 @@ public async Task UpdateRecordingJsonUpdatesProperly()
}

[Theory]
[InlineData("assets.json", false, "./")]
[InlineData("assets.json", true, "python/recordings")]
[InlineData("sdk/storage/assets.json", false, "sdk/storage")]
[InlineData("sdk/storage/assets.json", true, "python/recordings/sdk/storage")]
[InlineData("assets.json", false, "./ eng/")]
[InlineData("assets.json", true, "python/recordings eng/")]
[InlineData("sdk/storage/assets.json", false, "sdk/storage eng/")]
[InlineData("sdk/storage/assets.json", true, "python/recordings/sdk/storage eng/")]
public async Task ResolveCheckPathsResolvesProperly(string assetsJsonPath, bool includePrefix, string expectedResult)
{
var expectedPaths = new string[]
Expand Down