Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions aqua-checksums.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,28 @@
"algorithm": "sha256"
},
{
"id": "github_release/github.com/cli/cli/v2.96.0/gh_2.96.0_linux_amd64.tar.gz",
"checksum": "83D5C2CCAD5498F58BF6368ACB1AB32588CF43AB3A4B1C301BF36328B1C8BD60",
"id": "github_release/github.com/cli/cli/v2.97.0/gh_2.97.0_linux_amd64.tar.gz",
"checksum": "A2C9B8497E1F85B1AD0DFCB78B5A622E098801B8E461E459E88E1EE12F018112",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/cli/cli/v2.96.0/gh_2.96.0_linux_arm64.tar.gz",
"checksum": "06F86EC7103D41993B76CD78072F43595C34AAA56506D971D9860E67140BF909",
"id": "github_release/github.com/cli/cli/v2.97.0/gh_2.97.0_linux_arm64.tar.gz",
"checksum": "73EA440ECAD9C9E284429997EE6F93577BC6F7BC6FBA357EF62C53AD8FB641A5",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/cli/cli/v2.96.0/gh_2.96.0_macOS_arm64.zip",
"checksum": "F23A0C37D963AACC3BED703CCBD59B41C5CA22101FAB7F00EB2B7CAD23ABA463",
"id": "github_release/github.com/cli/cli/v2.97.0/gh_2.97.0_macOS_arm64.zip",
"checksum": "A58B8FD77B417A38F47A0B54D1370C59B0FCDB324CCC9CA002B0998F7C4C999E",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/cli/cli/v2.96.0/gh_2.96.0_windows_amd64.zip",
"checksum": "C2D6ACC935CD2F00E2144D7E036D5CD82E6B6BD5594E8C75AA75EF2A4ED6AAC3",
"id": "github_release/github.com/cli/cli/v2.97.0/gh_2.97.0_windows_amd64.zip",
"checksum": "35D7FE05C4DD1411FFDA1E73DFC7C6F44B75C936CA51FA6595C657FDC0350CEC",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/cli/cli/v2.96.0/gh_2.96.0_windows_arm64.zip",
"checksum": "C517E0B32C98A4BA90AC95AF8D12CC3AC55781AB4AB72F9A91CE3DE0541D2B09",
"id": "github_release/github.com/cli/cli/v2.97.0/gh_2.97.0_windows_arm64.zip",
"checksum": "3E2D4A166DA4EE5020C592737B65EEC0E724946D5D5B962F5FE59D99116DC4BF",
"algorithm": "sha256"
},
{
Expand Down Expand Up @@ -271,8 +271,8 @@
"algorithm": "sha256"
},
{
"id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.544.0/registry.yaml",
"checksum": "ED73709C88FA03BE758F78C25A35C07D48E2FA9D19E407F89FC36989A306E111",
"id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.550.0/registry.yaml",
"checksum": "CB90BB436C94AD3922E39BC88D281320CC7D9C2200EF2700197D989E74581FFA",
"algorithm": "sha256"
}
]
Expand Down
4 changes: 2 additions & 2 deletions aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ checksum:

registries:
- type: standard
ref: v4.544.0 # renovate: depName=aquaproj/aqua-registry
ref: v4.550.0 # renovate: depName=aquaproj/aqua-registry
- name: local
type: local
path: .limen/aqua-registry.yaml
Expand Down Expand Up @@ -56,4 +56,4 @@ packages:
- name: sigstore/cosign@v3.1.3
- name: gotestyourself/gotestsum@v1.13.0
- name: jqlang/jq@jq-1.8.2
- name: cli/cli@v2.96.0
- name: cli/cli@v2.97.0
10 changes: 5 additions & 5 deletions internal/rules/aqua_oneline_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ func TestAquaTwoLinePinsCollapsed(t *testing.T) {
" version: v1.2.2 # renovate: depName=_go/github.com/vbatts/git-validation\n"+
" registry: local\n", 1)
manifest = strings.Replace(manifest,
" - name: cli/cli@v2.96.0\n",
" - name: cli/cli\n version: v2.96.0 # held back on purpose\n", 1)
" - name: cli/cli@v2.97.0\n",
" - name: cli/cli\n version: v2.97.0 # held back on purpose\n", 1)

if strings.Count(manifest, "\n version:") != 4 {
t.Fatal("the fixture did not diverge from the canonical as intended — update the replacements")
Expand All @@ -73,7 +73,7 @@ func TestAquaTwoLinePinsCollapsed(t *testing.T) {
" - name: golang/go@go1.25.9\n",
" - name: \"jqlang/jq@jq-1.8.2\"\n",
" - name: github.com/vbatts/git-validation@v1.2.2\n registry: local\n",
" - name: cli/cli@v2.96.0 # held back on purpose\n",
" - name: cli/cli@v2.97.0 # held back on purpose\n",
} {
if !strings.Contains(out, want) {
t.Errorf("merged manifest lacks:\n%s\n--- got:\n%s", want, out)
Expand Down Expand Up @@ -118,7 +118,7 @@ func TestAquaTwoLinePinsFoldIntoWholesaleReplacement(t *testing.T) {
manifest = strings.Replace(manifest,
" - name: golang/go@go1.26.6\n",
" - name: golang/go\n version: go1.26.6 # renovate: depName=golang/go\n", 1)
manifest = strings.Replace(manifest, " - name: cli/cli@v2.96.0\n", "", 1) // now missing
manifest = strings.Replace(manifest, " - name: cli/cli@v2.97.0\n", "", 1) // now missing

parsed, ok := parseAquaManifest(manifest)
if !ok {
Expand All @@ -131,7 +131,7 @@ func TestAquaTwoLinePinsFoldIntoWholesaleReplacement(t *testing.T) {
}

if !strings.Contains(out, " - name: golang/go@go1.26.6\n") ||
!strings.Contains(out, " - name: cli/cli@v2.96.0\n") || strings.Contains(out, "\n version:") {
!strings.Contains(out, " - name: cli/cli@v2.97.0\n") || strings.Contains(out, "\n version:") {
t.Errorf("merged manifest:\n%s", out)
}

Expand Down