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.

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

Change dev instructions and CI #593

Merged
merged 12 commits into from
May 11, 2024
Merged

Change dev instructions and CI #593

merged 12 commits into from
May 11, 2024

Conversation

64J0
Copy link
Member

@64J0 64J0 commented May 4, 2024

Description

With this PR, I'm proposing a change in the development process, to stop using the develop -> master branch flow, and start using only the master branch.

  • Most people already targets the master branch when they are submitting their PRs.

With this in mind, I'm proposing some changes in the README (+ removing the reference to the night builds, since I think they're not running nowadays), DEVGUIDE and the CI workflows.

Related to the CI configuration, I'm separating the build and test workflow, which must work for all PRs and pushes, from the release workflow, which must run only when a new release is created.

Please let me know what you think.

How to test

Related issues

@64J0 64J0 self-assigned this May 4, 2024
TheAngryByrd
TheAngryByrd previously approved these changes May 4, 2024
nojaf
nojaf previously approved these changes May 5, 2024
@dbrattli
Copy link
Contributor

dbrattli commented May 5, 2024

Great. Let's use the opportunity to move to a main branch instead of master since this is the default on GitHub these days

@64J0
Copy link
Member Author

64J0 commented May 5, 2024

Great. Let's use the opportunity to move to a main branch instead of master since this is the default on GitHub these days

I like this idea @dbrattli.

Previously I was worried about the impact of this change, for example, the documentation at https://giraffe.wiki/. The contents at this site look pretty much what we have on the markdown files from the master branch. But after looking this code, I think it's going to be easy to update.

Please let me know about other potential impacts that you imagine.

@64J0 64J0 dismissed stale reviews from nojaf and TheAngryByrd via 191ff21 May 5, 2024 18:51
@64J0 64J0 requested review from TheAngryByrd and nojaf May 5, 2024 18:56
nojaf
nojaf previously approved these changes May 5, 2024
@64J0 64J0 marked this pull request as ready for review May 5, 2024 20:23
@64J0 64J0 changed the title WIP: Change dev instructions and CI Change dev instructions, master -> main and CI May 5, 2024
dbrattli
dbrattli previously approved these changes May 5, 2024
Copy link
Contributor

@dbrattli dbrattli left a comment

Choose a reason for hiding this comment

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

I'm really happy with this change. There might be issues related to renaming branches 🙈 but let's just "fail forward" and fix them if there's any

@64J0 64J0 changed the title Change dev instructions, master -> main and CI Change dev instructions and CI May 10, 2024
@64J0 64J0 requested review from dbrattli and nojaf May 10, 2024 22:56
@64J0
Copy link
Member Author

64J0 commented May 10, 2024

Reverted the commits to avoid replacing the master branch with main for now.

@64J0 64J0 merged commit e4e89a2 into master May 11, 2024
6 checks passed
@64J0 64J0 deleted the change-dev-and-release-process branch May 11, 2024 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants