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

Release 2024-05-17 #845

Merged
merged 3 commits into from
May 24, 2024
Merged

Release 2024-05-17 #845

merged 3 commits into from
May 24, 2024

Conversation

gabalafou
Copy link
Contributor

No description provided.

gabalafou and others added 2 commits March 20, 2024 14:07
@gabalafou
Simplify and clarify local dev instructions in README (#838)
4b4d843
@Carreau
Update Python3 statement url. (#842)
b4c1eb2 
See python3statement/python3statement.github.io#292

The devs will not renew the domain forever – it is redirecting for now,
but will not do that forever.
@vercel Vercel
Copy link

vercel bot commented May 17, 2024 •
edited

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
labs ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 24, 2024 4:36pm

rgommers
rgommers approved these changes May 21, 2024
View reviewed changes
Copy link
Member

@rgommers rgommers left a comment

Choose a reason for hiding this comment

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

This all looks fine to me, so go ahead and merge if you're happy @gabalafou.

We should really revisit this workflow and get rid of the two-stage deploy. We want PR merges to show up live straight away. That avoids having to do this dance. I'm not sure how easy that is - I'd assume not very. Could you please have a look at that?

@rgommers
Copy link
Member

@gabalafou I'm also reviewing blog posts right now (one merged, one to go). It'd be great to take those along here while you're at it.

@gabalafou
Copy link
Contributor Author

gabalafou commented May 23, 2024 •
edited

@gabalafou I'm also reviewing blog posts right now (one merged, one to go). It'd be great to take those along here while you're at it.

Sounds good, just ping me on Slack when ready

As for getting rid of the two-stage deploy process, here are some thoughts:

  • Configure main to be the default branch so that blog authors branch off main when working on a blog post
  • If a blog post PR is off main, then when it gets merged, it will be deployed straight away (no more two-stage process)
  • Leave the develop branch in place for riskier changes to the repo that should go through the two-stage deploy process
  • Occasionally we'll need to sync (rebase?) the develop branch with main. Seems to me that main should be the source of truth and develop should mirror main. (The alternative would be merge commits from main to the develop branch but that sounds messy in the long run.)
  • Update the docs to reflect the above

What do you think? Make sense? Am I missing anything obvious?

@rgommers
Copy link
Member

That sounds like a great plan. @trallard do you agree?

@gabalafou gabalafou merged commit 6efc2e2 into main May 24, 2024
2 checks passed
@gabalafou gabalafou deleted the release-2024-05-17 branch May 24, 2024 16:47
@trallard
Copy link
Member

Sounds great to me. I think we had the two step in the first place as a safeguard but happy to get rid of it

@gabalafou gabalafou mentioned this pull request May 28, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rgommers rgommers rgommers approved these changes

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

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

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@gabalafou @rgommers @trallard @Carreau @lysnikolaou