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

Workflow #21

Open
Tux opened this issue Oct 15, 2017 · 4 comments
Open

Workflow #21

Tux opened this issue Oct 15, 2017 · 4 comments
Assignees

Comments

@Tux
Copy link
Collaborator

Tux commented Oct 15, 2017

• Do we need to document the workflow to the group?
• Do we want a Label that members cat put with an issue like "Taken" or "Work in progress" so it is easier to pick issues to work on?

@jmdh
Copy link
Member

jmdh commented Oct 16, 2017 via email

@Tux
Copy link
Collaborator Author

Tux commented Oct 18, 2017

How about this?

  1. Create a new branch in metaconfig

  2. Create a new branch in perl

  3. Hack hack hack

  4. test :: pass ? 5 : 3

  5. Commit to metaconfig

  6. Push new metaconfig branch

  7. Push new perl branch

  8. Create a PR on the github → This can cause comments

  9. Someone merges PR to metaconfig

  10. Someone runs mlint and mconfig to regenerate Configure and friends

  11. That someone checks against the new perl branch and commits to perl

  12. Delete metaconfig branch

  13. Profite

@jmdh
Copy link
Member

jmdh commented Oct 19, 2017

I'm not too sure it makes sense to create a branch in perl.git. The person reviewing the PR would also generate Configure and see the changes there, and it would be good to have this process runnable by people without a commit bit. Also, steps 9-12 should always be performed by the same person.

That reduces it to

  1. Create a new branch in metaconfig (or a fork, if you are not a member of the metaconfig organisation)
    • you might also want to create a separate branch in your local perl repository but this won't immediately be pushed
  2. Hack hack hack
  3. test :: pass ? 5 : 3
  4. Commit to metaconfig
  5. Push new metaconfig branch
  6. Create a PR on the github → This can cause comments
  7. Once approved, the person who will merge the changes (who must be a committer here and on perl.git) does the following:
    • merge PR to metaconfig
    • runs mlint and mconfig to regenerate Configure and friends one more time
    • checks against the new perl branch and commits to perl
  8. Delete metaconfig branch

@Tux
Copy link
Collaborator Author

Tux commented Oct 19, 2017

The perl-git branch makes sense for changes that are handwork, like configure.com and the choice of the default in regenerating the related files. So yes, that would be optional, but very welcome for people that have commit bits. If this all is documented, that would be a good addition as comment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants