Merge branch 'main' into fix-migrate-mholt-archiver-v3

aquaproj · Jan 4, 2025 · 99ec76d · 99ec76d
2 parents d33ebfb + f248789
commit 99ec76d
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 32 deletions.
diff --git a/aqua/aqua-checksums.json b/aqua/aqua-checksums.json
@@ -111,33 +111,33 @@
       "algorithm": "sha256"
     },
     {
-      "id": "github_release/github.com/rhysd/actionlint/v1.7.5/actionlint_1.7.5_darwin_amd64.tar.gz",
-      "checksum": "6B765DA53B4C0F9B8F63DBDCDC12D800A8FEC36B21336940E166EAE329A210DC",
+      "id": "github_release/github.com/rhysd/actionlint/v1.7.6/actionlint_1.7.6_darwin_amd64.tar.gz",
+      "checksum": "A57E9862E6B4F6B8398FF134F0E07C9F0047142FB9EA8E7CDC4FEE05D24E89F4",
       "algorithm": "sha256"
     },
     {
-      "id": "github_release/github.com/rhysd/actionlint/v1.7.5/actionlint_1.7.5_darwin_arm64.tar.gz",
-      "checksum": "397119F9BAA3FD9FE195DB340B30ACDAEA532826E19A047A9CC9D96ADD7C267D",
+      "id": "github_release/github.com/rhysd/actionlint/v1.7.6/actionlint_1.7.6_darwin_arm64.tar.gz",
+      "checksum": "9A7C9CB2B627BB137EF68742EEAD2DD5B78F3DDC44876E84C37D323BA28B4710",
       "algorithm": "sha256"
     },
     {
-      "id": "github_release/github.com/rhysd/actionlint/v1.7.5/actionlint_1.7.5_linux_amd64.tar.gz",
-      "checksum": "3E6E0A832DFA0B5F027E6B8956AAD2632D69B7CB778B1CFF847B40279950A856",
+      "id": "github_release/github.com/rhysd/actionlint/v1.7.6/actionlint_1.7.6_linux_amd64.tar.gz",
+      "checksum": "5D1A70D9DE15FEE5371E6F9E20CC29B284E814D6EE1B882F9749E91CAF716EBA",
       "algorithm": "sha256"
     },
     {
-      "id": "github_release/github.com/rhysd/actionlint/v1.7.5/actionlint_1.7.5_linux_arm64.tar.gz",
-      "checksum": "CB992426D176CF5C2F9CD0ECD36722EACE064282DDE7125F2B6813F2A299AB36",
+      "id": "github_release/github.com/rhysd/actionlint/v1.7.6/actionlint_1.7.6_linux_arm64.tar.gz",
+      "checksum": "5D8B6B5BF0BC7BBE69A5EA779329EB7825C768248DD0DA979D98E39D924ABC7F",
       "algorithm": "sha256"
     },
     {
-      "id": "github_release/github.com/rhysd/actionlint/v1.7.5/actionlint_1.7.5_windows_amd64.zip",
-      "checksum": "B6271ADD72E21BBD3CFFBFB7105ADE7F8648CD2CED0C94184F47705BADC7AE0D",
+      "id": "github_release/github.com/rhysd/actionlint/v1.7.6/actionlint_1.7.6_windows_amd64.zip",
+      "checksum": "48D327E7744EF863CD85DF1CC29BE810BD7A1D03026132AB34E4DDBFE839F685",
       "algorithm": "sha256"
     },
     {
-      "id": "github_release/github.com/rhysd/actionlint/v1.7.5/actionlint_1.7.5_windows_arm64.zip",
-      "checksum": "FDFB665BFA53866373E5B6FADA218B5285B06AF70A1C192AE4460F8847667A73",
+      "id": "github_release/github.com/rhysd/actionlint/v1.7.6/actionlint_1.7.6_windows_arm64.zip",
+      "checksum": "ABF8F1910C0BC7821121AA820E071ABFF19A34829E621382F11B1DDE934944EE",
       "algorithm": "sha256"
     },
     {
@@ -226,8 +226,8 @@
       "algorithm": "sha256"
     },
     {
-      "id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.289.0/registry.yaml",
-      "checksum": "ACD37F94CFEFC3A632A228C58914B4A505A1F60920A951A0383BCE621F082B06CDEF3F93A171CB27BFE7E47B087F165D79772B258EE86EB268EDA7893D1E40AC",
+      "id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.291.0/registry.yaml",
+      "checksum": "31A0C654DC1256DFC37AF811E222A379C9716E03F70C7C0A5A616D98979A5412E9D4B2D1C10C5C677F31D75A84D62A60759F377216F83481A11A472024D53497",
       "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.289.0 # renovate: depName=aquaproj/aqua-registry
+    ref: v4.291.0 # renovate: depName=aquaproj/aqua-registry
 packages:
   - import: imports/*.yaml
diff --git a/aqua/imports/actionlint.yaml b/aqua/imports/actionlint.yaml
@@ -1,2 +1,2 @@
 packages:
-  - name: rhysd/actionlint@v1.7.5
+  - name: rhysd/actionlint@v1.7.6
diff --git a/go.mod b/go.mod
@@ -28,8 +28,8 @@ require (
 	github.com/suzuki-shunsuke/logrus-error v0.1.4
 	github.com/urfave/cli/v2 v2.27.5
 	github.com/wk8/go-ordered-map/v2 v2.1.8
-	golang.org/x/oauth2 v0.24.0
-	golang.org/x/sys v0.28.0
+	golang.org/x/oauth2 v0.25.0
+	golang.org/x/sys v0.29.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 )

diff --git a/go.sum b/go.sum
@@ -322,8 +322,8 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
-golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
+golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -360,8 +360,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=

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.289.0" // renovate: depName=aquaproj/aqua-registry
+	registryVersion := "v4.291.0" // 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.289.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.291.0 # 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.289.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.291.0 # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: hashicorp/terraform@v1.10.3
 - 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.289.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.291.0 # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: crates.io/skim@0.15.7
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.289.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.291.0 # 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.289.0 # renovate: depName=aquaproj/aqua-registry
+    ref: v4.291.0 # renovate: depName=aquaproj/aqua-registry
 packages:
   - name: bufbuild/buf@v1.48.0
   - 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.289.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.291.0 # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: suzuki-shunsuke/tfcmt@v4.14.1
   tags:

diff --git a/tests/version_expr_file/aqua.yaml b/tests/version_expr_file/aqua.yaml
@@ -9,7 +9,7 @@
 #   - all
 registries:
 - type: standard
-  ref: v4.289.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.291.0 # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: hashicorp/terraform
   version_expr: |

diff --git a/tests/version_expr_json/aqua.yaml b/tests/version_expr_json/aqua.yaml
@@ -9,7 +9,7 @@
 #   - all
 registries:
 - type: standard
-  ref: v4.289.0  # renovate: depName=aquaproj/aqua-registry
+  ref: v4.291.0  # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: hashicorp/terraform
   version_expr: |

diff --git a/tests/version_expr_yaml/aqua.yaml b/tests/version_expr_yaml/aqua.yaml
@@ -9,7 +9,7 @@
 #   - all
 registries:
 - type: standard
-  ref: v4.289.0  # renovate: depName=aquaproj/aqua-registry
+  ref: v4.291.0  # renovate: depName=aquaproj/aqua-registry
 packages:
 - name: hashicorp/terraform
   version_expr: |