Skip to content

on installation save channel to config.php if not stable - #34136

Merged
blizzz merged 2 commits into
masterfrom
fix/default-channel
Oct 21, 2022
Merged

on installation save channel to config.php if not stable#34136
blizzz merged 2 commits into
masterfrom
fix/default-channel

Conversation

@blizzz

@blizzzblizzz commented Sep 19, 2022

Copy link
Copy Markdown
Member
  • the default channel to the NC server is what is provided in /version.php unless it is overridden in config.php
  • the default channel to the NC Updater however is 'stable'
  • this resultant in inconsistent results and confusing admin experience
  • therefore "stable" is considered default and other channels are being written to config.php now upon installation

This seems to be more straight forward than to maintaining the same strategy of determining a default on the Updater (and forgetting about it).

Fixesnextcloud/updater#436

@blizzzblizzz added bug 3. to review Waiting for reviews labels Sep 19, 2022
@blizzzblizzz added this to the Nextcloud 25 milestone Sep 19, 2022
@blizzz
blizzz requested review from a team, PVince81, come-nc and skjnldsv and removed request for a teamSeptember 19, 2022 11:56
@blizzz
blizzz marked this pull request as ready for review September 19, 2022 11:56
github-advanced-security[bot]
github-advanced-securityAI found potential problems Sep 19, 2022
View reviewed changes
Comment threadlib/private/Setup.php Fixed
PVince81
PVince81 approved these changes Sep 19, 2022
View reviewed changes

@PVince81PVince81 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.

👍

another alternative would be to make the updater also read the channel from version.php, I believe this information is already read anyway ?

come-nc
come-nc reviewed Sep 19, 2022
View reviewed changes
Comment threadlib/private/Setup.php Outdated
@come-nc

come-nc commented Sep 19, 2022

Copy link
Copy Markdown
Contributor

(did not approve because I do not understand it…)

@blizzz

blizzz commented Sep 19, 2022

Copy link
Copy Markdown
MemberAuthor

another alternative would be to make the updater also read the channel from version.php, I believe this information is already read anyway ?

as said in my opening ^:

This [approach] seems to be more straight forward than to maintaining the same strategy of determining a default on the Updater (and forgetting about it).

@blizzz

blizzz commented Sep 19, 2022

Copy link
Copy Markdown
MemberAuthor

(did not approve because I do not understand it…)

The updater defaults to the "stable" channel, if none is set otherwise: https://github.com/nextcloud/updater/blob/master/lib/Updater.php#L123-L125
But Nextcloud server, defaults to what is written in version.php.

Now when you install the beta, and a new beta release is available, Nextcloud will notify you about it, but the updater would tell you that there is not update available for beta are only available on beta channel.

@blizzz

blizzz commented Sep 19, 2022

Copy link
Copy Markdown
MemberAuthor

I don't know how to make psalm shut up. composer run psalm:update-baseline ends in errors.

@blizzzblizzz mentioned this pull request Sep 19, 2022
Merged
@come-nc

come-nc commented Sep 19, 2022

Copy link
Copy Markdown
Contributor

I don't know how to make psalm shut up. composer run psalm:update-baseline ends in errors.

composer run psalm:update-baseline is for removing errors from baseline, not adding them.
You need to run composer run psalm -- --set-baseline=tests/psalm-baseline.xml iirc

This was referenced Sep 20, 2022
Closed
Merged
@blizzzblizzz modified the milestones: Nextcloud 25, Nextcloud 26Sep 22, 2022
@blizzz

blizzz commented Oct 21, 2022

Copy link
Copy Markdown
MemberAuthor

/rebase

@blizzz
on installation save channel to config.php if not stable
403923d
- the default channel to the NC server is what is provided in /version.php
unless it is overridden in config.php
- the default channel to the NC Updater however is 'stable'
- this resultant in inconsistent results and confusing admin experience
- therefore "stable" is considered default and other channels are being
written to config.php now upon installation
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
silence psalm
2ef9826
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
blizzzforce-pushed the fix/default-channel branch from 8819dfc to 2ef9826CompareOctober 21, 2022 13:35
@blizzzblizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 21, 2022
@blizzz

blizzz commented Oct 21, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to stable25

@blizzz

blizzz commented Oct 21, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to stable24

@blizzz

blizzz commented Oct 21, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to stable23

@blizzz
blizzz merged commit 294a00d into masterOct 21, 2022
@blizzz
blizzz deleted the fix/default-channel branch October 21, 2022 15:14
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Oct 21, 2022
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PVince81PVince81PVince81 approved these changes
@CarlSchwanCarlSchwanCarlSchwan approved these changes
@come-nccome-nccome-nc approved these changes
@skjnldsvskjnldsvAwaiting requested review from skjnldsv

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 26

Development

Successfully merging this pull request may close these issues.

Updating from 25.0.0 beta5 to beta6 shows no update

6 participants

@blizzz@come-nc@PVince81@CarlSchwan@github-advanced-security@skjnldsv