这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@rob1997
Copy link
Collaborator

@rob1997 rob1997 commented Apr 2, 2024

This is a change to the Contribution Format and Flow due to certain GitHub actions not being able to execute successfully on forked branches.

Flow Changes

  • Contributors will now target the dev branch for PRs from a forked repo
  • We now use dev branch instead of main for development
  • All out PRs will target dev moving forward
  • We can then merge dev to main for release or every mid/full sprint [We can discuss this more]

Action Changes

  • Extra Commit now happen on dev as a single commit and triggers on push to dev and commits and pushes only if all unity tests pass
  • On a PR to main and/or dev we run lint, web3 tests and code analyze however unity tests only run on PR to main because they access repository secrets that can't be accessed from a forked branch

Next Steps

  • Force merge this to main on approval because required checks are different on main
  • Create and Push dev branch
  • Set appropriate branch protection rules to dev

@rob1997 rob1997 self-assigned this Apr 2, 2024
@rob1997 rob1997 added the ready-to-merge Ready to Merge PR - this'll trigger required checks label Apr 2, 2024
@rob1997 rob1997 added ready-to-merge Ready to Merge PR - this'll trigger required checks and removed ready-to-merge Ready to Merge PR - this'll trigger required checks labels Apr 2, 2024
@rob1997 rob1997 closed this Apr 2, 2024
@rob1997 rob1997 reopened this Apr 2, 2024
@rob1997 rob1997 added ready-to-merge Ready to Merge PR - this'll trigger required checks and removed ready-to-merge Ready to Merge PR - this'll trigger required checks labels Apr 2, 2024
Copy link
Member

@kalambet kalambet left a comment

Choose a reason for hiding this comment

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

Great work, Rob!

@rob1997 rob1997 merged commit 0b20c06 into main Apr 2, 2024
@rob1997 rob1997 deleted the rob/contribution-format-fix branch April 2, 2024 12:25
rob1997 added a commit that referenced this pull request Jan 16, 2025
* Revert "automated duplicating imported samples modifications (#595)"

This reverts commit a555894.

* made main package testable, revert due to a mistake

* checkpoint

* ignored samples

* Make commits on push to dev and checks on PR to main and dev

* test 1

* unity tests and push refactored into jobs instead of steps

* removed unity tests from check and commit

* reverted libraries delete

* test commit message

* test commit message 2

* test commit message 3

* added tests and workflow call usage

* unity tests run on workflow call now

* switched test branch to dev

* Edited CONTRIBUTION.md to reflect flow changes

* some syntax changes

* small syntax fix

---------

Co-authored-by: robGG1997 <robel@chainsafe.io>
sergeypanin1994 pushed a commit to sergeypanin1994/web3.unity that referenced this pull request Mar 16, 2025
* Revert "automated duplicating imported samples modifications (ChainSafe#595)"

This reverts commit a555894.

* made main package testable, revert due to a mistake

* checkpoint

* ignored samples

* Make commits on push to dev and checks on PR to main and dev

* test 1

* unity tests and push refactored into jobs instead of steps

* removed unity tests from check and commit

* reverted libraries delete

* test commit message

* test commit message 2

* test commit message 3

* added tests and workflow call usage

* unity tests run on workflow call now

* switched test branch to dev

* Edited CONTRIBUTION.md to reflect flow changes

* some syntax changes

* small syntax fix

---------

Co-authored-by: robGG1997 <robel@chainsafe.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to Merge PR - this'll trigger required checks

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants