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

Upgrade to Plone 6.0.0rc1 #1541

Merged
merged 6 commits into from
Nov 22, 2022
Merged

Upgrade to Plone 6.0.0rc1 #1541

merged 6 commits into from
Nov 22, 2022

Conversation

tisto
Copy link
Member

@tisto tisto commented Nov 21, 2022

No description provided.

@mister-roboto
Copy link

@tisto thanks for creating this Pull Request and helping to improve Plone!

TL;DR: Finish pushing changes, pass all other checks, then paste a comment:

@jenkins-plone-org please run jobs

To ensure that these changes do not break other parts of Plone, the Plone test suite matrix needs to pass, but it takes 30-60 min. Other CI checks are usually much faster and the Plone Jenkins resources are limited, so when done pushing changes and all other checks pass either start all Jenkins PR jobs yourself, or simply add the comment above in this PR to start all the jobs automatically.

Happy hacking!

@netlify
Copy link

netlify bot commented Nov 21, 2022 •
edited
Loading

✅ Deploy Preview for plone-restapi canceled.

Name Link
🔨 Latest commit 60e6430
🔍 Latest deploy log https://app.netlify.com/sites/plone-restapi/deploys/637c2d75be61b10008cfd353

@tisto tisto mentioned this pull request Nov 21, 2022
Closed
mauritsvanrees
mauritsvanrees reviewed Nov 21, 2022
View reviewed changes
Copy link
Member

@mauritsvanrees mauritsvanrees left a comment

Choose a reason for hiding this comment

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

LGTM, but the workingcopy_baseline_get.resp test is having an uncommitted change again. I wonder if it depends on the timezone of the action runner. We do explicitly set it to UTC both in base.cfg and in testing.py, so it may be something else.

@tisto
Copy link
Member Author

tisto commented Nov 21, 2022

@mauritsvanrees that's super odd. I won't have time tonight or tomorrow to look into this. Though, I could cut a release at any time if needed. Maybe @reebalazs can have a look tomorrow...

tisto and others added 3 commits November 21, 2022 19:02
@tisto
Merge branch 'master' into plone-6.0.0rc1
16eb34e
@mauritsvanrees
Revert "Fix CI (#1540)"
61123f1 
This reverts commit 03d421b.
After upgrading to 6.0.0rc1 this is no longer needed.
@mauritsvanrees
Fix expected lock created time in workingcopy_baseline_get.resp.
7337ba8 
I am not sure if this is stable.
It *does* seem to fit the timestamp in the same lock info though:

```
>>> datetime.fromtimestamp(807204600.0).isoformat()
'1995-07-31T17:30:00'
```
@mauritsvanrees
Copy link
Member

mauritsvanrees commented Nov 21, 2022 •
edited
Loading

Your merge of master in here made it fail more. The longer basic auth should be reverted. See the comment by @davisagli on my PR: with rc1 this is not needed.

I have reverted that, and part of the workingcopy/lock change. Let's see.

@jenkins-plone-org please run jobs

@davisagli
Copy link
Member

The tests are green now, so I'll merge. We probably still need to take a look at the timezone-dependence in workingcopy_baseline_get.resp, separately

@davisagli davisagli merged commit af0e5e3 into master Nov 22, 2022
@davisagli davisagli deleted the plone-6.0.0rc1 branch November 22, 2022 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mauritsvanrees mauritsvanrees mauritsvanrees left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tisto @mister-roboto @mauritsvanrees @davisagli