Skip to content

Increase version to 10.1 prealpha#28043

Merged
PVince81 merged 13 commits intomasterfrom
increase-version
Feb 23, 2018
Merged

Increase version to 10.1 prealpha#28043
PVince81 merged 13 commits intomasterfrom
increase-version

Conversation

@PVince81
Copy link
Copy Markdown
Contributor

@PVince81 PVince81 commented May 31, 2017

Set version to 10.1 prealpha.

Assuming we still allow to upgrade from 9.0.9 thanks to all the migration code all the way up to 10.1.

@DeepDiver1975 @phisch @jvillafanez

@PVince81 PVince81 added this to the 10.1 milestone May 31, 2017
@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented May 31, 2017

Note: most marketplace apps not compatible:

Repair warning: please install app manually with tarball or disable them with:
occ app:disable comments
occ app:disable dav
occ app:disable federatedfilesharing
occ app:disable federation
occ app:disable files
occ app:disable files_external
occ app:disable files_sharing
occ app:disable files_trashbin
occ app:disable files_versions
occ app:disable provisioning_api
occ app:disable systemtags
occ app:disable updatenotification

@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented May 31, 2017

should we the wait before increasing version ?

@DeepDiver1975
Copy link
Copy Markdown
Member

DeepDiver1975 commented May 31, 2017

should we the wait before increasing version ?

well - we need to bump these version as well ....

@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented May 31, 2017

bump the versions first and unbundle later ? or unbundle first ?

@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented May 31, 2017

okay of course I'll update the min version of these bundled apps...

@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented May 31, 2017

Here we go. With only git there is no more error on occ upgrade.

Repository apps (ex: activity, etc) will also need version adjustements.

@PVince81 PVince81 force-pushed the increase-version branch 2 times, most recently from eb1f2fa to 9e83d7f Compare May 31, 2017 14:48
@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented Jun 21, 2017

Merge this or wait a bit longer ? (might block dev flow until we adjust all apps)

@DeepDiver1975
Copy link
Copy Markdown
Member

DeepDiver1975 commented Jun 22, 2017

Let's wait a bit until all apps are in marketplace

@PVince81 PVince81 modified the milestones: development, 10.1 Jul 4, 2017
@PVince81 PVince81 modified the milestones: planned, development Aug 3, 2017
@PVince81 PVince81 mentioned this pull request Aug 16, 2017
Merged
@PVince81 PVince81 modified the milestones: development, backlog Nov 3, 2017
@PVince81 PVince81 mentioned this pull request Jan 31, 2018
Closed
9 tasks
@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented Jan 31, 2018

  • make PHP 7.1 the minimum in composer.json

@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented Feb 7, 2018

@DeepDiver1975 move forward with this ? if apps are not compatible then so be it. they need to be made compatible and be tested one by one and released to the marketplace.

The moment where all apps must be in the marketplace and compatible is before 10.1 RC1

@DeepDiver1975
Copy link
Copy Markdown
Member

DeepDiver1975 commented Feb 7, 2018

yes - lets merge this in .... things need to move on

@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented Feb 7, 2018

rebased

also updated min php version to php 7.1

Once merged let's go with the Guzzle update as well. We'll need to update individual apps to be compatible with this (fresh) by updating their guzzle libs as well.

It also means such apps will need two branches: one for 10.0 and one for 10.1.

@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented Feb 7, 2018

@patrickjahns as I understand updating phpunit to 6 would break out tests, so this will need to be done separately with the backportable and forward-compatible namespace changes

@phil-davis
Copy link
Copy Markdown
Contributor

phil-davis commented Feb 7, 2018

can we merge #30242 first?
to get a "nice" point of being up-to-date with composer versions against PHP 5.6
(that "backports" to stable10 nicely and gives a point of comparison between master and stable10 before versions of stuff all diverge)

@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented Feb 7, 2018 •
edited by DeepDiver1975
Loading

Fine by me.

@DeepDiver1975 please review ^

phil-davis
phil-davis reviewed Feb 22, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

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

Looks good - I only found 1 duplicated CI job.

.travis.yml Outdated
- php: 7.1
env: DB=sqlite TC=syntax TEST_DAV=0
- php: 7.0
- php: 7.1
Copy link
Copy Markdown
Contributor

@phil-davis phil-davis Feb 22, 2018

Choose a reason for hiding this comment

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

now duplicates the matrix entry above

Copy link
Copy Markdown
Member

@DeepDiver1975 DeepDiver1975 Feb 22, 2018

Choose a reason for hiding this comment

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

taken care off - THX

phil-davis
phil-davis approved these changes Feb 22, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

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

All good as far as I can see.
Of course there will be plenty of use/testing/manual QA to do in addition to the automated CI, to see if there are any problems with the various dependencies that bump upwards. But in theory that should all be better :)

@PVince81 PVince81 merged commit fc206fc into master Feb 23, 2018
@PVince81 PVince81 deleted the increase-version branch February 23, 2018 08:04
@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented Feb 23, 2018

@phil-davis next up the Guzzle PR ?

@phil-davis
Copy link
Copy Markdown
Contributor

phil-davis commented Feb 23, 2018

I will rebase it...

@individual-it individual-it mentioned this pull request Feb 26, 2018
Closed
@phil-davis phil-davis mentioned this pull request Mar 18, 2019
Merged
@phil-davis phil-davis mentioned this pull request Mar 30, 2019
Closed
10 tasks
@phil-davis
Copy link
Copy Markdown
Contributor

phil-davis commented Mar 30, 2019

Note: many parts of this PR are already back in stable10 because they were not all directly just PHP7.1 commits.
The remaining PHP7.1-specific parts have been cherry-picked into backport PR #34936 ready for the day that we can drop PHP7.0 support. When those backport commits have been merged, then the only-in-master label can be removed here.

This was referenced Jul 8, 2019
Merged
Closed
@phil-davis phil-davis mentioned this pull request Jul 31, 2019
Closed
10 tasks
@phil-davis phil-davis mentioned this pull request Oct 18, 2019
Closed
10 tasks
@phil-davis phil-davis mentioned this pull request Nov 28, 2019
Merged
@lock lock bot locked as resolved and limited conversation to collaborators Apr 2, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@DeepDiver1975 DeepDiver1975 DeepDiver1975 approved these changes

@phil-davis phil-davis phil-davis approved these changes

@tomneedham tomneedham Awaiting requested review from tomneedham

@butonic butonic Awaiting requested review from butonic

@individual-it individual-it Awaiting requested review from individual-it

Assignees

@DeepDiver1975 DeepDiver1975

Labels

3 - To Review technical debt

Projects

None yet

Milestone

maybe some day

Development

Successfully merging this pull request may close these issues.

6 participants

@PVince81 @DeepDiver1975 @phil-davis @ownclouders @patrickjahns @individual-it