Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore: replace submodule with subtree#6082

Merged
jdx merged 17 commits into
jdx:mainfrom
risu729:aqua-registry-subtree
Aug 20, 2025
Merged

chore: replace submodule with subtree#6082
jdx merged 17 commits into
jdx:mainfrom
risu729:aqua-registry-subtree

Conversation

@risu729

@risu729 risu729 commented Aug 20, 2025

Copy link
Copy Markdown
Contributor

Copilot AI review requested due to automatic review settings August 20, 2025 17:20

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull Request Overview

This pull request removes the aqua-registry submodule by converting all submodule package definitions into standalone files. The PR addresses the refactoring of the aqua-registry structure to eliminate dependency on Git submodules.

Key Changes:

  • Removes aqua-registry submodule dependency
  • Converts all package definitions to standalone YAML files
  • Maintains complete package registry functionality through direct file inclusion

Reviewed Changes

Copilot reviewed 300 out of 4034 changed files in this pull request and generated no comments.

File Description
Multiple registry.yaml files Package definition files for various tools including registries for Pluralith CLI, Gex, DevDash, and many other developer tools
Multiple pkg.yaml files Package version specifications corresponding to each tool's registry definition
Multiple scaffold.yaml files Configuration files for package generation and maintenance workflows

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@risu729 risu729 changed the title refactor: remove aqua-registry submodule chore: replace submodule with subtree Aug 20, 2025
@jdx

jdx commented Aug 20, 2025

Copy link
Copy Markdown
Owner

release-plz has some logic that needs to be updated too that updates aqua-registry during the release commit, we should squash all the changes from aqua-registry for the release branch

@risu729

risu729 commented Aug 20, 2025

Copy link
Copy Markdown
Contributor Author

GitHub cannot list all changed files, unfortunately.
Could you check 4510e51?
For else, I added --exclude aqua-registry for hk because I couldn't find a global exclude in the config.

349a2849b4 chore: update sqldef/sqldef/psqldef v2.0.9 to v2.0.10 (#40371)
e0ad00ea84 chore: update sqldef/sqldef/mssqldef v2.0.9 to v2.0.10 (#40370)
93f11756f6 chore: update protocolbuffers/protobuf-go/protoc-gen-go v1.36.7 to v1.36.8 (#40369)
cf807b40e2 chore: update yarnpkg/berry @yarnpkg/cli/4.9.2 to @yarnpkg/cli/4.9.3 (#40368)

git-subtree-dir: aqua-registry
git-subtree-split: 349a2849b456bf4f4da0ad066368664ffdff1b22
@risu729

risu729 commented Aug 20, 2025

Copy link
Copy Markdown
Contributor Author

As you see, the commit Squashed 'aqua-registry/' changes from... is not signed. I'm not sure but it might not be signed in the release PR too.

Comment thread xtasks/release-plz Outdated
man/
git clean -df
git checkout -B release
git subtree pull --squash --prefix=aqua-registry https://github.com/aquaproj/aqua-registry main

@jdx jdx Aug 20, 2025

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

I think this needs to be done after the commit but I could be wrong

@risu729 risu729 Aug 20, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed. I think the order doesn't matter It does, uncommitted changes will cause an error.

@jdx

jdx commented Aug 20, 2025

Copy link
Copy Markdown
Owner

bugbot run

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ Bugbot reviewed your changes and found no bugs!


@jdx jdx merged commit 87d9572 into jdx:main Aug 20, 2025
55 of 57 checks passed
@jdx

jdx commented Aug 20, 2025

Copy link
Copy Markdown
Owner

as a follow-up we should remove the logic in the aqua backend that fetches registry information from mise-versions

@risu729 risu729 deleted the aqua-registry-subtree branch August 21, 2025 08:09
@risu729

risu729 commented Aug 21, 2025

Copy link
Copy Markdown
Contributor Author

I'll work on it.
Btw, do you care about this?
The simpler git clone method is good, but the modified .gitattributes is not preserved. I think we can just overwrite it after the clone.
image

@risu729

risu729 commented Aug 21, 2025

Copy link
Copy Markdown
Contributor Author

I'm not sure how many people are using aqua.registry_url, but I see some problems with it.
At first, aqua supports multiple registries, and each tool needs to specify which registry to use.
https://aquaproj.github.io/docs/reference/config/#registries
Currently, I think the only reason to use this option is to use a fork of aquaproj/aqua-registry.

Also, we need to clear the cache (.cache/mise/aqua-registry/) to change this. I think we should save the registry_url with the cache.

Shall we remove this option, or should we support multiple registries as aqua?
I think it's useful if someone wants to install their private tool with aqua, but the github backend should be able to resolve most cases.

If we remove it, we can simply clone aquaproj/aqua-registry when the baked_registry option is disabled (to use the latest registry), or fetch each registry from GitHub.
e.g. https://raw.githubusercontent.com/aquaproj/aqua-registry/refs/heads/main/pkgs/BurntSushi/ripgrep/registry.yaml
I'm not really sure about the purpose of mise-versions, but if it was to avoid many API requests to GitHub, I think it's safe to remove the proxy because I don't expect many people to disable the option.

@jdx

jdx commented Aug 21, 2025

Copy link
Copy Markdown
Owner

I'm not sure how many people are using aqua.registry_url, but I see some problems with it.
At first, aqua supports multiple registries, and each tool needs to specify which registry to use.

it's a good question, but I doubt many people if any are using it. I think what we should have is the ability to have additional aqua registries at some point. Maybe we want to deprecate changing the default?

I had a look at the code though and I think we could remove the mise-versions stuff without touching that part of the code, but I could be wrong. If you wanted to work on multiple aqua registries I would be massively in favor, I know a few people have asked for that.

I'm not really sure about the purpose of mise-versions, but if it was to avoid many API requests to GitHub

it was for performance since cloning the repo and fetching the latest version is a lot slower than an http request

jdx pushed a commit that referenced this pull request Aug 22, 2025
The aqua registry is now always baked in, so the fallback is not
required.
#6082

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
@risu729

risu729 commented Aug 22, 2025

Copy link
Copy Markdown
Contributor Author

Thanks, I'll work on multiple registries later. I think we can have it as a tool option.

@risu729

risu729 commented May 31, 2026

Copy link
Copy Markdown
Contributor Author

Follow-up for the custom aqua registry discussion in this PR: opened draft PR #10179 to support multiple ordered custom aqua registries: #10179

The implementation keeps the existing single-string aqua.registry_url syntax, adds list/comma-separated env support, scopes caches by registry URL/source, checks registries in configured order, and falls back to the baked registry when enabled. Aqua registry aliases remain registry-local; cross-registry/mise shorthand aliases should use [tool_alias].

This comment was generated by an AI coding assistant.

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.

3 participants