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

Fixes twitch panel (uplift to 0.66.x) #2664

Merged
merged 1 commit into from
Jun 13, 2019
Merged

Fixes twitch panel (uplift to 0.66.x) #2664

merged 1 commit into from
Jun 13, 2019

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Jun 11, 2019

Uplift of #2618

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@NejcZdovc NejcZdovc added this to the 0.66.x - Beta milestone Jun 11, 2019
@NejcZdovc NejcZdovc requested a review from a team June 11, 2019 17:54
@NejcZdovc NejcZdovc self-assigned this Jun 11, 2019
@NejcZdovc NejcZdovc changed the title Twitch fix 66 Fixes twitch panel (uplift to 0.66.x) Jun 11, 2019
@kjozwiak
Copy link
Member

kjozwiak commented Jun 11, 2019

@NejcZdovc looks like the original PR failed due to the following:

FAILED: obj/brave/vendor/bat-native-ledger/ledger/twitch.o 

Let me know once you push a new PR and I'll keep an eye on CI 👍

@NejcZdovc
Copy link
Contributor Author

NejcZdovc commented Jun 12, 2019

@kjozwiak fixed this error, let's see what CI will tell us now :) (it was merge conflict left over)

@kjozwiak
Copy link
Member

@NejcZdovc awesome, thanks @NejcZdovc 👍 I'll keep an eye on Jenkins and check once it's completed.

@kjozwiak
Copy link
Member

@NejcZdovc I took a look at the Jenkins failures and saw two lint failures which I think are fine and an issue with publishing the xUnit report which is I believe is fine as well. Mind doing a quick double check? But I think we should be good to uplift into 0.66.x 👍

@NejcZdovc
Copy link
Contributor Author

@kjozwiak lint is not related to this PR as we are linting the whole thing. xUnit is not related either

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 0.66.x approved. Please make sure that all the correct labels are being used and that the appropriate issue is moved into the correct milestone.

@NejcZdovc NejcZdovc merged commit d1ad3d5 into 0.66.x Jun 13, 2019
@NejcZdovc NejcZdovc deleted the twitch-fix-66 branch June 13, 2019 05:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants