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

[Localization] Use force-with-lease #15054

Merged
merged 1 commit into from
May 18, 2022

Conversation

tj-devel709
Copy link
Member

In the localization process, we try to delete the Localization branch, and then create a new Localization branch from main in order to sync main and Localization. In this seemingly random instance, the Localization branch was not able to be deleted https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=6164579&view=logs&j=ee797c9a-308f-58f3-15cb-bf937fe4c606&t=83c41547-0a37-55a1-12ce-d2da371355ea.
This caused us not to be able to push to the localization branch. If this happens again, let's force-with-lease the push to override this.

I will also be turning off the github action that also syncs the Localization branch in a similar manner since we do not need two automations that do the same thing.

@tj-devel709 tj-devel709 added the not-notes-worthy Ignore for release notes label May 17, 2022
@tj-devel709 tj-devel709 added this to the Future milestone May 17, 2022
@vs-mobiletools-engineering-service2
Copy link
Collaborator

📋 [PR Build] API Diff 📋

API diff (for current PR)

ℹ️ API Diff (from PR only) (please review changes)

API diff: vsdrops gist

Xamarin
.NET
Xamarin vs .NET
iOS vs Mac Catalyst (.NET)

API diff (vs stable)

✅ API Diff from stable

API diff: vsdrops gist

Xamarin
.NET
Xamarin vs .NET
iOS vs Mac Catalyst (.NET)

Generator diff

Generator Diff (no change)

Pipeline on Agent XAMBOT-1023.Monterey'
Hash: fe425568010a8bec1aba31c17a95eb57fb765128

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1042.Monterey
Hash: fe425568010a8bec1aba31c17a95eb57fb765128

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS Mac Catalina (10.15) passed 💻

All tests on macOS Mac Catalina (10.15) passed.

Pipeline on Agent
Hash: fe425568010a8bec1aba31c17a95eb57fb765128

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) failed ❌

Failed tests are:

  • xammac_tests
  • monotouch-test

Pipeline on Agent
Hash: fe425568010a8bec1aba31c17a95eb57fb765128

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [CI Build] Tests passed on VSTS: simulator tests iOS. ✅

Tests passed on VSTS: simulator tests iOS.

🎉 All 145 tests passed 🎉

Pipeline on Agent XAMBOT-1042.Monterey'
Merge fe42556 into 2aae39d

@chamons
Copy link
Contributor

chamons commented May 18, 2022

From StackOverflow since i had to look it up:

--force-with-lease will protect all remote refs that are going to be updated by requiring 
their current value to be the same as some reasonable default, unless otherwise specified;

For now, "some reasonable default" is tentatively defined as "the value of the remote-tracking 
branch we have for the ref of the remote being updated", and it is an error if we do not have 
such a remote-tracking branch.

Copy link
Contributor

@chamons chamons left a comment

Choose a reason for hiding this comment

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

Force always scares me, but I think this is good.

@tj-devel709 tj-devel709 merged commit 1477c9b into dotnet:main May 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
not-notes-worthy Ignore for release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants