Skip to content

Commit

Permalink
Merge branch 'main' into feat-keyring
Browse files Browse the repository at this point in the history
  • Loading branch information
suzuki-shunsuke authored Oct 14, 2024
2 parents e36c611 + 8f24077 commit 508cc3f
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions aqua/aqua-checksums.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@
"algorithm": "sha256"
},
{
"id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.233.0/registry.yaml",
"checksum": "4A257D28FD6EC0E27FEFFF8599958C35BDF32273989B16DAB00F17F51936CF9E8147DB5B1A4843AC0E258D5FAD2AF610E960A15F09DD35413B37E4C783C0F064",
"id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.234.0/registry.yaml",
"checksum": "4DA45C79E98C89D060DA4DEAB23D688E1782092E3481804740D3EF47DDF01BA975B344BB4C2C83F6E9C2C9E72D647FDEB13B73347B26451FE926D942AB0FF12E",
"algorithm": "sha512"
}
]
Expand Down
2 changes: 1 addition & 1 deletion aqua/aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ checksum:
require_checksum: true
registries:
- type: standard
ref: v4.233.0 # renovate: depName=aquaproj/aqua-registry
ref: v4.234.0 # renovate: depName=aquaproj/aqua-registry
packages:
- import: imports/*.yaml
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ require (
github.com/suzuki-shunsuke/go-findconfig v1.2.0
github.com/suzuki-shunsuke/go-osenv v0.1.0
github.com/suzuki-shunsuke/logrus-error v0.1.4
github.com/urfave/cli/v2 v2.27.4
github.com/urfave/cli/v2 v2.27.5
github.com/wk8/go-ordered-map/v2 v2.1.8
github.com/zalando/go-keyring v0.2.5
golang.org/x/oauth2 v0.23.0
Expand All @@ -42,7 +42,7 @@ require (
github.com/andybalholm/brotli v1.0.1 // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/danieljoos/wincred v1.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPn
github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE=
github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec=
Expand Down Expand Up @@ -188,8 +188,8 @@ github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oW
github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8=
github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/initcmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (c *Controller) Init(ctx context.Context, logE *logrus.Entry, cfgFilePath s
return nil
}

registryVersion := "v4.233.0" // renovate: depName=aquaproj/aqua-registry
registryVersion := "v4.234.0" // renovate: depName=aquaproj/aqua-registry
release, _, err := c.github.GetLatestRelease(ctx, logE, "aquaproj", "aqua-registry")
if err != nil {
logerr.WithError(logE, err).WithFields(logrus.Fields{
Expand Down
2 changes: 1 addition & 1 deletion tests/3064/aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ checksum:
# - all
registries:
- type: standard
ref: v4.233.0 # renovate: depName=aquaproj/aqua-registry
ref: v4.234.0 # renovate: depName=aquaproj/aqua-registry
packages:
- name: suzuki-shunsuke/cmdx
version: v1.7.4
2 changes: 1 addition & 1 deletion tests/cargo/aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
# - all
registries:
- type: standard
ref: v4.233.0 # renovate: depName=aquaproj/aqua-registry
ref: v4.234.0 # renovate: depName=aquaproj/aqua-registry
packages:
- name: crates.io/[email protected]
2 changes: 1 addition & 1 deletion tests/main/aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ checksum:
registries:
- type: standard
type: standard # duplicated keys
ref: v4.233.0 # renovate: depName=aquaproj/aqua-registry
ref: v4.234.0 # renovate: depName=aquaproj/aqua-registry
- null

packages:
Expand Down
2 changes: 1 addition & 1 deletion tests/minisign/aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ checksum:
# - all
registries:
- type: standard
ref: v4.233.0 # renovate: depName=aquaproj/aqua-registry
ref: v4.234.0 # renovate: depName=aquaproj/aqua-registry
packages:
- name: bufbuild/[email protected]
- name: bufbuild/buf
Expand Down
2 changes: 1 addition & 1 deletion tests/tag/aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# require_checksum: true
registries:
- type: standard
ref: v4.233.0 # renovate: depName=aquaproj/aqua-registry
ref: v4.234.0 # renovate: depName=aquaproj/aqua-registry
packages:
- name: suzuki-shunsuke/[email protected]
tags:
Expand Down

0 comments on commit 508cc3f

Please sign in to comment.