Skip to content

disable upgrades to 26 on 32-bit#446

Merged
blizzz merged 5 commits intomasterfrom
enh/noid/disable-update-to-26-on-32bit
Nov 17, 2022
Merged

disable upgrades to 26 on 32-bit#446
blizzz merged 5 commits intomasterfrom
enh/noid/disable-update-to-26-on-32bit

Conversation

@szaimen
Copy link
Contributor

@szaimen szaimen commented Nov 1, 2022

Signed-off-by: szaimen szaimen@e.mail.de

@szaimen szaimen added this to the Nextcloud 26 milestone Nov 1, 2022
@szaimen
Copy link
Contributor Author

szaimen commented Nov 1, 2022

/backport to stable25

blizzz
blizzz reviewed Nov 1, 2022
View reviewed changes
blizzz
blizzz reviewed Nov 1, 2022
View reviewed changes
@blizzz
Copy link
Member

blizzz commented Nov 1, 2022

For the tests, Nextcloud was not installed correctly. But I am not convinced the errors are a result by your code.

szaimen
szaimen commented Nov 1, 2022
View reviewed changes
@szaimen szaimen requested a review from blizzz November 1, 2022 18:46
@szaimen szaimen marked this pull request as ready for review November 1, 2022 18:47
@szaimen
Copy link
Contributor Author

szaimen commented Nov 2, 2022 •
edited
Loading

BTW, the same code base test should be fixed in a follow-up as it was already failing before my PR.

@szaimen szaimen mentioned this pull request Nov 3, 2022
Merged
@szaimen szaimen requested a review from kesselb November 13, 2022 21:45
kesselb
kesselb reviewed Nov 13, 2022
View reviewed changes
@come-nc
Copy link
Collaborator

come-nc commented Nov 14, 2022

/rebase

@come-nc
Copy link
Collaborator

come-nc commented Nov 14, 2022

@szaimen Please rebase

@szaimen
disable upgrades to 26 on 32-bit
9cc0541 
Signed-off-by: szaimen <szaimen@e.mail.de>
@szaimen
try to fix checks
163f362 
Signed-off-by: szaimen <szaimen@e.mail.de>
@szaimen
address review and fix one test
ddc200d 
Signed-off-by: szaimen <szaimen@e.mail.de>
@szaimen szaimen force-pushed the enh/noid/disable-update-to-26-on-32bit branch from 44043b1 to ddc200d Compare November 14, 2022 11:07
@szaimen
address review
d57a58e 
Signed-off-by: Simon L <szaimen@e.mail.de>
@szaimen
Copy link
Contributor Author

szaimen commented Nov 14, 2022

@szaimen Please rebase

done

@szaimen szaimen requested review from kesselb and removed request for come-nc November 14, 2022 11:10
@szaimen szaimen requested a review from come-nc November 14, 2022 11:12
@come-nc
Copy link
Collaborator

come-nc commented Nov 14, 2022 •
edited
Loading

@szaimen You need to run make updater.phar to update the phar as well with your changes

@szaimen

This comment was marked as resolved.

Sign in to view
@szaimen szaimen force-pushed the enh/noid/disable-update-to-26-on-32bit branch from 139949e to fa5ab5b Compare November 15, 2022 15:12
@szaimen
Copy link
Contributor Author

szaimen commented Nov 15, 2022

@come-nc I just commited the updater.phar. Please have another look :)

@szaimen
Copy link
Contributor Author

szaimen commented Nov 15, 2022

@come-nc do you have any idea why Check same code base / check-same-code-base (8.0) (pull_request) still fails? I've simply did as suggested and rebuild the updater.phar. Is maybe the problem that I've used PHP8.1 for that?

@come-nc
Copy link
Collaborator

come-nc commented Nov 15, 2022

@come-nc do you have any idea why Check same code base / check-same-code-base (8.0) (pull_request) still fails? I've simply did as suggested and rebuild the updater.phar. Is maybe the problem that I've used PHP8.1 for that?

Composer version maybe?

@szaimen
Copy link
Contributor Author

szaimen commented Nov 15, 2022

Composer version maybe?

OMG! Let me simply create a workflow for this...

@come-nc
Copy link
Collaborator

come-nc commented Nov 15, 2022 

==> Setup Tools
✓ composer Added composer 2.4.4

The CI use that, what do you have?

@szaimen
Copy link
Contributor Author

szaimen commented Nov 15, 2022 •
edited
Loading

The CI use that, what do you have?

2.2.6

@come-nc
Copy link
Collaborator

come-nc commented Nov 15, 2022

Then that’s it, you need to update before making the phar

@szaimen
commit updater.phar
f319f36 
Signed-off-by: Simon L <szaimen@e.mail.de>
@szaimen szaimen force-pushed the enh/noid/disable-update-to-26-on-32bit branch from 0617a7d to f319f36 Compare November 15, 2022 16:22
@szaimen
Copy link
Contributor Author

szaimen commented Nov 15, 2022

all right. lets check if that works

@szaimen
Copy link
Contributor Author

szaimen commented Nov 15, 2022

All right, seems to work. @come-nc please have a look again :)

come-nc
come-nc approved these changes Nov 17, 2022
View reviewed changes
Copy link
Collaborator

@come-nc come-nc left a comment

Choose a reason for hiding this comment

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

Approved apart from translation question (but it looks like the other texts are not translated either?)

@szaimen
Copy link
Contributor Author

szaimen commented Nov 17, 2022

apart from translation question (but it looks like the other texts are not translated either?)

yes, that is why I didn't bother trying to translate the error messages.

@blizzz blizzz merged commit e79122a into master Nov 17, 2022
@delete-merged-branch delete-merged-branch bot deleted the enh/noid/disable-update-to-26-on-32bit branch November 17, 2022 11:39
@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Nov 17, 2022

The backport to stable25 failed. Please do this backport manually.

@szaimen
Copy link
Contributor Author

szaimen commented Nov 17, 2022

/backport to stable25

@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Nov 17, 2022

The backport to stable25 failed. Please do this backport manually.

@szaimen szaimen mentioned this pull request Nov 17, 2022
Merged
@szaimen szaimen mentioned this pull request Nov 24, 2022
Closed
@PVince81 PVince81 mentioned this pull request Jan 10, 2023
Closed
20 tasks
@come-nc come-nc mentioned this pull request Feb 7, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@come-nc come-nc come-nc approved these changes

@blizzz blizzz Awaiting requested review from blizzz

@PVince81 PVince81 Awaiting requested review from PVince81

@skjnldsv skjnldsv Awaiting requested review from skjnldsv skjnldsv is a code owner

@artonge artonge Awaiting requested review from artonge

@kesselb kesselb Awaiting requested review from kesselb

Assignees

No one assigned

Labels

4. to release

Projects

None yet

Milestone

Nextcloud 26

Development

Successfully merging this pull request may close these issues.

4 participants

@szaimen @blizzz @come-nc @kesselb