Merge branch 'main' into feat-version-expr-2

aquaproj · Dec 15, 2024 · c41c36a · c41c36a
2 parents b477798 + 5737f8b
commit c41c36a
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/aqua/aqua-checksums.json b/aqua/aqua-checksums.json
@@ -216,8 +216,8 @@
       "algorithm": "sha256"
     },
     {
-      "id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.276.0/registry.yaml",
-      "checksum": "B43662956C2BA8D29D997334A2683D22907B477E243BDA43AE8C89DA5E110944EA1FA9D0EC218B96292FC36C9965AA65A39BDBA28E05FF28D0495B52B93E9B25",
+      "id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.276.1/registry.yaml",
+      "checksum": "0B9D65A3E6C8761501CB6467019928A20F11B13D35FE8D392E18E56835CD87AFBC60A4BB0F7A1F6705C02A271723B312FF0A5DF874FB719CB11EC463EB231533",
       "algorithm": "sha512"
     }
   ]

diff --git a/aqua/aqua.yaml b/aqua/aqua.yaml
@@ -7,6 +7,6 @@ checksum:
   require_checksum: true
 registries:
   - type: standard
-    ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry
+    ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry
 packages:
   - import: imports/*.yaml
diff --git a/pkg/config/package.go b/pkg/config/package.go
@@ -100,7 +100,7 @@ func (p *Package) PkgPath(rootDir string, rt *runtime.Runtime) (string, error) {
 		return filepath.Join(rootDir, "pkgs", pkgInfo.Type, p, pkg.Version, "bin"), nil
 	case PkgInfoTypeCargo:
 		registry := "crates.io"
-		return filepath.Join(rootDir, "pkgs", pkgInfo.Type, registry, pkgInfo.Crate, pkg.Version), nil
+		return filepath.Join(rootDir, "pkgs", pkgInfo.Type, registry, pkgInfo.Crate, strings.TrimPrefix(pkg.Version, "v")), nil
 	case PkgInfoTypeGitHubContent, PkgInfoTypeGitHubRelease:
 		if pkgInfo.RepoOwner == "aquaproj" && (pkgInfo.RepoName == "aqua" || pkgInfo.RepoName == "aqua-proxy") {
 			return filepath.Join(rootDir, "internal", "pkgs", pkgInfo.Type, "github.com", pkgInfo.RepoOwner, pkgInfo.RepoName, pkg.Version, assetName), nil

diff --git a/pkg/controller/initcmd/init.go b/pkg/controller/initcmd/init.go
@@ -50,7 +50,7 @@ func (c *Controller) Init(ctx context.Context, logE *logrus.Entry, cfgFilePath s
 		return nil
 	}
 
-	registryVersion := "v4.276.0" // renovate: depName=aquaproj/aqua-registry
+	registryVersion := "v4.276.1" // renovate: depName=aquaproj/aqua-registry
 	release, _, err := c.github.GetLatestRelease(ctx, "aquaproj", "aqua-registry")
 	if err != nil {
 		logerr.WithError(logE, err).WithFields(logrus.Fields{

diff --git a/tests/3064/aqua.yaml b/tests/3064/aqua.yaml
@@ -9,7 +9,7 @@ checksum:
 #   - all
 registries:
 - type: standard
-  ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: suzuki-shunsuke/cmdx
   version: v1.7.4
diff --git a/tests/aliases/aqua.yaml b/tests/aliases/aqua.yaml
@@ -9,7 +9,7 @@
 #   - all
 registries:
 - type: standard
-  ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: hashicorp/terraform@v1.10.2
 - name: hashicorp/terraform

diff --git a/tests/cargo/aqua.yaml b/tests/cargo/aqua.yaml
@@ -9,6 +9,6 @@
 #   - all
 registries:
 - type: standard
-  ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: crates.io/skim@0.15.5
diff --git a/tests/main/aqua.yaml b/tests/main/aqua.yaml
@@ -3,7 +3,7 @@ checksum:
   require_checksum: false
 registries:
 - type: standard
-  ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry
 - null
 
 packages:

diff --git a/tests/minisign/aqua.yaml b/tests/minisign/aqua.yaml
@@ -8,7 +8,7 @@ checksum:
 #   - all
 registries:
   - type: standard
-    ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry
+    ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry
 packages:
   - name: bufbuild/buf@v1.47.2
   - name: bufbuild/buf

diff --git a/tests/tag/aqua.yaml b/tests/tag/aqua.yaml
@@ -7,7 +7,7 @@
 #   require_checksum: true
 registries:
 - type: standard
-  ref: v4.276.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.276.1 # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: suzuki-shunsuke/tfcmt@v4.14.0
   tags: