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

[TS] Fix horizontalAlignment parsing bug #2553

Merged
merged 48 commits into from Apr 3, 2019
Merged

[TS] Fix horizontalAlignment parsing bug #2553

merged 48 commits into from Apr 3, 2019

Conversation

dclaux
Copy link
Member

@dclaux dclaux commented Mar 20, 2019

@shalinijoshi19
Copy link
Member

Also any way we can push features up separately and into master as you dev them so they dont all get associated with a single PR or one set of multiple commits? just to containerize and serialize commits a bit more? Makes it easy to roll commits back should one be buggy.. it would help us track issues and completeness throughout the milestone leading up to release and not just the day of .. slightly easier to manage...thanks a ton..

matthidinger and others added 5 commits March 29, 2019 11:24
 - adaptivecards-controls@0.1.7
 - adaptivecards-designer-app@0.1.4
 - adaptivecards-designer@0.5.0
 - adaptivecards-site@0.3.4
 - hexo-theme-adaptivecards@0.0.5
 - adaptivecards-visualizer@1.1.6
 - adaptivecards@1.2.0-beta1
@shalinijoshi19 shalinijoshi19 added this to the 1904 milestone Apr 1, 2019
@shalinijoshi19 shalinijoshi19 added this to In progress in 1.2 Release via automation Apr 1, 2019
@matthidinger
Copy link
Member

@dclaux this branch seems good, do you have an ETA when you want to merge it? I just added my review

Copy link
Member

@paulcam206 paulcam206 left a comment

Choose a reason for hiding this comment

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

:shipit:

@shalinijoshi19
Copy link
Member

Hmm seems to be a package-lock.json conflict that's likely blocking merge. @dclaux FYI

@dclaux
Copy link
Member Author

dclaux commented Apr 3, 2019

No idea why the NodeJS build is failing. I made no change beside pulling master and it compiles just fine on my machine. I will override this and merge anyway if everyone agrees.

@paulcam206
Copy link
Member

It should be rare indeed that we override a failing build -- especially when the build is failing for the thing you're authoring. We need to understand why the build failed before we can consider skipping it.

@matthidinger -- looks like some failing build stuff here. Do we need updates or refinements to our CI build definition?

@paulcam206
Copy link
Member

Meanwhile, I'll trigger another build to see if it may be related to problems on the agent.

@paulcam206
Copy link
Member

/AzurePipelines run

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

@paulcam206
Copy link
Member

Looks like it was a hiccup with the CI job. We should try to understand why the build was flaky.

@dclaux
Copy link
Member Author

dclaux commented Apr 3, 2019

It is also somewhat impractical IMO that changes only in the NodeJS path could be blocked by iOS checks for example (or the other way around.) We should consider splitting things up.

@paulcam206
Copy link
Member

I agree that it's impractical. Unfortunately, as far as I've been able to figure out, checks can be only be marked required at the branch level, not at the changed-directory level -- so we either live with people checking in build breaks, or we live with having unneeded checks running for all PRs.

@dclaux
Copy link
Member Author

dclaux commented Apr 3, 2019

What's with the license/cla check that won't complete?

@dclaux
Copy link
Member Author

dclaux commented Apr 3, 2019

Alright, and now another merge for a non-JS-related change has just reset the whole things. Happened twice today already. I am going to forcefully merge my changes now, after pulling the latest from master.

@dclaux dclaux merged commit bb7cb2c into master Apr 3, 2019
1.2 Release automation moved this from In progress to Done Apr 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
1.2 Release
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants