Skip to content

Merge servarr stack #869

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

Merged
merged 1 commit into from
Oct 24, 2024
Merged

Merge servarr stack #869

merged 1 commit into from
Oct 24, 2024

Conversation

txtsd
Copy link
Contributor

@txtsd txtsd commented Oct 20, 2024

It's my first time contributing in this repo.

I'm going to use ${servarr} as a variable to denote any *arr app to explain what this PR aims to achieve.

${servarr} and ${servarr}-bin should be the same version.
${servarr}-develop and ${servarr}-develop-bin should be the same version, and they are development versions.
${servarr}-nightly and ${servarr}-nightly-bin should be the same version, and they are also development versions.

Please let me know if my yaml-fu is correct, or if it needs changing~

Copy link
Member

@AMDmi3 AMDmi3 left a comment

Choose a reason for hiding this comment

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

  • Please don't put these into separate file, this makes it harder to look for rules. Rulest should be spread alphabetically.
  • Please only merge names which are not currently merged. For instance, for sonarr, only sonarr-develop needs merging, not sonarr-bin, sonarr-develop-bin, sonarr-nightly, or sonarr-nightly-bin
  • -develop and -nighly merges need weak_devel: true, nolegacy: true instead of flavor

@txtsd
Copy link
Contributor Author

txtsd commented Oct 23, 2024

Rules can be easily grep'd for. I didn't think that would be a problem.

Regardless, I'll make the changes!

EDIT: Are -bin packages automatically classified under their main project? If so, should I remove the -bin for sonarr?

@txtsd
Copy link
Contributor Author

txtsd commented Oct 23, 2024

Okay, ready for re-review!

Copy link
Member

@AMDmi3 AMDmi3 left a comment

Choose a reason for hiding this comment

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

Like I've mentioned,

  • You don't need flavors for nightly/develop. Note that you can also stick nightly and develop into the same rule where applicable.
  • Please don't merge non-existing projects. Check project search first, if there's no e.g. whisparr-nightly-bin, rules should not mention it.

EDIT: Are -bin packages automatically classified under their main project? If so, should I remove the -bin for sonarr?

This depends on repository. They are for aur but aren't for gentoo, and that rule is needed for gentoo, so no, please don't remove it.

@txtsd
Copy link
Contributor Author

txtsd commented Oct 23, 2024

The nighties and develops should be the same version each respectively though. Is that handled without flavors?

@AMDmi3
Copy link
Member

AMDmi3 commented Oct 23, 2024

The nighties and develops should be the same version each respectively though. Is that handled without flavors?

Repology does not check version equivalence between packages. develop/develop-bin/nightly/nightly-bin will be handled independently, but the same way, ignored if version higher than release version and outdated if lower.

@txtsd
Copy link
Contributor Author

txtsd commented Oct 24, 2024

Okay, ready for review again!

The *-nightly packages on the AUR have been merged into *-nightly-bin, so there aren't any *-nightly, there are only *-nightly-bin now.

@txtsd
Copy link
Contributor Author

txtsd commented Oct 24, 2024

Rebased on master

Copy link
Member

@AMDmi3 AMDmi3 left a comment

Choose a reason for hiding this comment

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

  • Please don't merge non-existing projects

This has not been fixed yet. See comments for examples.

Signed-off-by: txtsd <[email protected]>
@txtsd
Copy link
Contributor Author

txtsd commented Oct 24, 2024

Now it makes sense!

I was thinking in terms of packages, not projects.

I've got the hang of it now for future contributions!

Ready for (hopefully final) review~

@txtsd
Copy link
Contributor Author

txtsd commented Oct 24, 2024

Can you also show me how to mark some repositories' packages as develop?

For example in radarr, Chocolatey, Gentoo, and LiGurOS develop package the develop versions of radarr so the actual stable versions are shown as outdated.

@AMDmi3 AMDmi3 merged commit d02e5d1 into repology:master Oct 24, 2024
1 check passed
@txtsd txtsd deleted the servarr branch October 24, 2024 13:09
AMDmi3 added a commit that referenced this pull request Oct 24, 2024
@AMDmi3
Copy link
Member

AMDmi3 commented Oct 24, 2024

Can you also show me how to mark some repositories' packages as develop?

We just mark these repositories as untrusted. Marking version range as devel is possible, but that would require regular manual updating of a rule, we don't want that. It would be better if upstream conveyed release status in a versioning scheme, such as using -betaX suffix or even/odd approach. It looks like bazarr does use beta suffix, and in fact we can remove weak_devel from its merge rule as long as we trust bazarr-beta to always have beta suffix.

@txtsd
Copy link
Contributor Author

txtsd commented Oct 24, 2024

Okay I'll open a new PR for the rest of the packages. Thanks for showing me how!

I'm the maintainer of bazarr-beta. I can guarantee it will always be beta.

Also, how often is the website updated?

@AMDmi3
Copy link
Member

AMDmi3 commented Oct 24, 2024

Also, how often is the website updated?

Once each 4-5 hours.

@txtsd
Copy link
Contributor Author

txtsd commented Oct 24, 2024

I see ruleset: liguros, but I don't see a way to specifically target LiGurOS Develop.

Without that we'd have to make a rule for each develop version that lands 👀

@AMDmi3
Copy link
Member

AMDmi3 commented Oct 24, 2024

We just ban whole repository (which provides unstable version) untrusted, you don't need to specify versions for that.
And you can just use ruleset: gentoo which would affect both gentoo and liguros.

@txtsd txtsd mentioned this pull request Oct 27, 2024
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.

2 participants