Skip to content

[stable13] Use a phan version instead of master - #8195

Merged
MorrisJobke merged 1 commit into
stable13from
13-8172
Feb 6, 2018
Merged

[stable13] Use a phan version instead of master#8195
MorrisJobke merged 1 commit into
stable13from
13-8172

Conversation

@MorrisJobke

Copy link
Copy Markdown
Member

Backport of #8172

@MorrisJobkeMorrisJobke added the 3. to review Waiting for reviews label Feb 6, 2018
@MorrisJobkeMorrisJobke added this to the Nextcloud 13.0.1 milestone Feb 6, 2018

@danxuliudanxuliu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Phan 0.11.1 requires PHP 7.2, but its image version was not bumped (second commit from original pull request was not included in this oneedit: well, second commit would not be valid on its own either; it would require the bump from the third one anyway to use the latest PHP 7.2 image).

@codecov

codecovBot commented Feb 6, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8195 into stable13 will not change coverage.
The diff coverage is n/a.

@@ Coverage Diff @@## stable13 #8195 +/- ##
===========================================
Coverage 51.23% 51.23% Complexity 24985 24985 ===========================================
Files 1607 1607 Lines 95062 95062 Branches 1376 1376 ===========================================
Hits 48701 48701 Misses 46361 46361

@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

also 7.2-11 contains already a newer PHPUnit - so I used the old php 7.2-9 image ;) Let's see

@danxuliu

Copy link
Copy Markdown
Member

Phan needs Redis and Imagick, which were included in 7.2-11. Is the newer PHPUnit incompatible with Phan tests in stable13? In that case I guess that we will have to use Phan 0.10.x for stable13, as Phan 0.10.x is compatible with PHP 7.1.

@rullzer

Copy link
Copy Markdown
Member

Aaah right... yeah just use the one compatible with 7.1 for 13 then i think.

@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

Phan needs Redis and Imagick, which were included in 7.2-11. Is the newer PHPUnit incompatible with Phan tests in stable13? In that case I guess that we will have to use Phan 0.10.x for stable13, as Phan 0.10.x is compatible with PHP 7.1.

I just wanted to keep the versions the same. Let me try with 7.2-11 and if this does not work we will use 0.10.x of phan.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@danxuliu

Copy link
Copy Markdown
Member

Drone is happy with 7.2-11 :-D

@MorrisJobke
MorrisJobke merged commit b16824d into stable13Feb 6, 2018
@MorrisJobke
MorrisJobke deleted the 13-8172 branch February 6, 2018 15:42
@MorrisJobkeMorrisJobke mentioned this pull request Mar 9, 2018
10 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@MorrisJobke@danxuliu@rullzer