#569 merge fedora-badges and fedora-badges-assets repositories
Closed: fixed 6 years ago Opened 6 years ago by jibecfed.

Hi there,

it is a little bit confusing to have all discussion here, and actual code content in fedora-badges-assets.
I assume it's coming from trac's time, when code repositories and tracs where at different places?

I think there also something to do with: https://github.com/fedora-infra/fedbadges/ which should be in Pagure too. While this is not high priority, I suggest to mention it in the README: https://pagure.io/Fedora-Badges/pull-request/568


Theoretically, this should be easy to do. The only thing that would need to be changed would be this playbook. It could be interested to simplify the workflow by keeping it all in one repo.

Alternatively, I think it would be cleaner if we claimed pagure.io/fedora-badges for this anyways… but maybe my 2¢. I'm in favor of merging these things together, but I wouldn't mind a cursory look about this from @ralph or @sayanchowdhury.

Metadata Update from @jflory7:
- Custom field artwork adjusted to None
- Custom field concept_review_passed adjusted to None

6 years ago

Just a note: Not having the assets here is very weird and confusing. Please merge.

@riecatnor @mleonova @duffy @sayanchowdhury Would it break anyone's workflow if we did this? I could find some time during the weekend to do it, when the impact would be minimal.

Edit: See fedora-infrastructure#6395 for more information

Metadata Update from @riecatnor:
- Issue tagged with: bug

6 years ago

@jflory7 we are fine with whatever makes the most sense! go ahead and do it. It shouldn't be too disruptive to work flow :) thanks!

No issues from my end too. And as @jflory7 said it would be fairly simple to merge the two.

The Badge assets are now in this repository, as seen in this commit. I tried to make the commit message helpful for later review. All future Badges should be pushed to this repository (cc: @nb @sayanchowdhury).

I have a patch ready to fix the playbook in Fedora Infrastructure to point here instead, but I am waiting on two tickets to be closed before doing that, no. 6395 and no. 6427.

Before we do anything else:

It seems you have squashed the entire git history into one commit. I'm not very happy about that, actually I would like us to revisit this approach.

This migration can be done in 2 good ways (and possibly more):

  • push force the entire repo with assets here while dumping what was here before
  • merge unrelated histories with a merge commit

Pushing one commit with everything is bad, because:

  • the history, authorship information, commit messages is all gone (we need to preserve the assets repo to keep track, and look there when we need this kind of information)
  • the commit makes Pagure Error 500, because it's too big

Do we still have a chance to make this the right way?

I agree with @churchyard

I think merging unrelated histories is the easiest one and should fix the issue. I have merged and push the commits to my fork.

@nb @jflory7 @churchyard Please verify my fork once. If things look okay. I will go ahead and push to this repo. https://pagure.io/fork/sayanchowdhury/Fedora-Badges/commits/merge-repos

Also please don't push any badges for the time being

I would improve the merge commit message ("Merge fedora-badges-assets into Fedora-Badges"), but otherwise it looks good!

I have updated the merge commit message and push the changes in the production i.e Fedora-Badges repo. If everything is sorted. We can go ahead and close this issue.

Also, we can push new badges now

Metadata Update from @sayanchowdhury:
- Issue close_status updated to: fixed
- Issue status updated to: Closed (was: Open)

6 years ago

Login to comment on this ticket.

Metadata