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.

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

Jump to bottom

Bypass apps blocking for daily/git channel #33844

Merged
merged 1 commit into from
Dec 12, 2018
Merged

Bypass apps blocking for daily/git channel #33844

merged 1 commit into from
Dec 12, 2018

Conversation

VicDeo
Copy link
Member

@VicDeo VicDeo commented Dec 10, 2018 •
edited
Loading

Description

As agreed in #33360, we skip max-version check for the git and daily channel on install.
We should also do so when running occ upgrade and any related operations.

Related Issue

Motivation and Context

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

@VicDeo VicDeo added this to the development milestone Dec 10, 2018
@VicDeo VicDeo self-assigned this Dec 10, 2018
@codecov
Copy link

codecov bot commented Dec 10, 2018 •
edited
Loading

Codecov Report

Merging #33844 into master will increase coverage by <.01%.
The diff coverage is 80%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #33844      +/-   ##
============================================
+ Coverage     64.42%   64.42%   +<.01%     
- Complexity    18318    18320       +2     
============================================
  Files          1197     1197              
  Lines         69260    69264       +4     
  Branches       1276     1276              
============================================
+ Hits          44621    44625       +4     
  Misses        24267    24267              
  Partials        372      372
Flag Coverage Δ Complexity Δ
#javascript 52.98% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.75% <80%> (ø) 18320 <2> (+2) ⬆️
Impacted Files Coverage Δ Complexity Δ
lib/private/Repair/Apps.php 26.62% <80%> (+1.77%) 48 <2> (+2) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b0b384d...9d585b9. Read the comment docs.

@VicDeo VicDeo force-pushed the fix-33819 branch 3 times, most recently from e35fefc to f317940 Compare December 10, 2018 17:59
@VicDeo VicDeo requested a review from PVince81 December 10, 2018 19:59
@PVince81
Copy link
Contributor

@VicDeo please update unit test or state why it's not possible.

@VicDeo
Copy link
Member Author

VicDeo commented Dec 11, 2018

@PVince81 possible [in a way that I don't like]. Added.

@VicDeo VicDeo mentioned this pull request Dec 11, 2018
Merged
9 tasks
@VicDeo
Copy link
Member Author

VicDeo commented Dec 11, 2018

Stable10: #33861

@VicDeo
Copy link
Member Author

VicDeo commented Dec 12, 2018

@ownclouders rebase

@ownclouders
Copy link
Contributor

Hey! I'm GitMate.io! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost permanently ⚠️

@ownclouders
Copy link
Contributor

Automated rebase with GitMate.io was successful! 🎉

@owncloud owncloud deleted a comment from codecov bot Dec 12, 2018
@VicDeo
Copy link
Member Author

VicDeo commented Dec 12, 2018

@PVince81 please rereview

PVince81
PVince81 reviewed Dec 12, 2018
View reviewed changes
tests/lib/Repair/AppsTest.php
* @param string[] $blockingApps
* @param bool $expectedResult
*/
public function testHasBlockingIncompatibleApps($channel, $blockingApps, $expectedResult) {
Copy link
Contributor

Choose a reason for hiding this comment

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

achievement unlocked: codecov pleaser :-D

PVince81
PVince81 approved these changes Dec 12, 2018
View reviewed changes
Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81 PVince81 merged commit 79813c6 into master Dec 12, 2018
@PVince81 PVince81 deleted the fix-33819 branch December 12, 2018 13:21
@PVince81
Copy link
Contributor

@VicDeo I don't think we need to backport as it would only affect updating apps from OC < 10

@lock lock bot locked as resolved and limited conversation to collaborators Dec 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@phil-davis phil-davis phil-davis left review comments

@PVince81 PVince81 PVince81 approved these changes

Assignees

@VicDeo VicDeo

Labels
3 - To Review
Projects
None yet
Milestone
development
Development

Successfully merging this pull request may close these issues.

[master] Cannot upgrade from stable10 to master due to max-version
4 participants
@VicDeo @PVince81 @ownclouders @phil-davis