Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: aquaproj/aqua
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.29.1
Choose a base ref
...
head repository: aquaproj/aqua
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.29.2
Choose a head ref
  • 2 commits
  • 11 files changed
  • 2 contributors

Commits on Jul 14, 2024

  1. chore(deps): update dependency aquaproj/aqua to v2.29.1 (#3000) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jul 14, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    cbdb90b View commit details

  2. fix: update checksums of cosign (#3001) 

    * fix: update checksums of cosign

- Follow up #2993

* ci: enable cosign and slsa verification

* test: fix test data
    @suzuki-shunsuke
    suzuki-shunsuke authored Jul 14, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    07fd5ea View commit details
2 changes: 1 addition & 1 deletion .github/workflows/actionlint.yaml
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
actionlint:
uses: suzuki-shunsuke/actionlint-workflow/.github/workflows/actionlint.yaml@813a6d08c08cfd7a08618a89a59bfe78e573597c # v1.0.1
with:
aqua_version: v2.29.0
aqua_version: v2.29.1
aqua_policy_allow: true
permissions:
pull-requests: write
2 changes: 1 addition & 1 deletion .github/workflows/debug-with-action-tmate.yaml
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
GITHUB_TOKEN: ${{github.token}}
- uses: aquaproj/aqua-installer@6ce1f8848ec8e61f14d57bd5d7597057a6dd187c # v3.0.1
with:
aqua_version: v2.29.0
aqua_version: v2.29.1
env:
AQUA_GITHUB_TOKEN: ${{github.token}}
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
homebrew: true
go-version: 1.22.5
aqua_policy_allow: true
aqua_version: v2.29.0
aqua_version: v2.29.1
app_token_repositories: >-
[
"${{github.event.repository.name}}",
2 changes: 1 addition & 1 deletion .github/workflows/wc-ghalint.yaml
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: aquaproj/aqua-installer@6ce1f8848ec8e61f14d57bd5d7597057a6dd187c # v3.0.1
with:
aqua_version: v2.29.0
aqua_version: v2.29.1
env:
AQUA_GITHUB_TOKEN: ${{github.token}}
- run: ghalint run
2 changes: 1 addition & 1 deletion .github/workflows/wc-go-mod-tidy.yaml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ jobs:
uses: suzuki-shunsuke/go-mod-tidy-workflow/.github/workflows/go-mod-tidy.yaml@6795635605311526bdd23dbe7f96e6f4a33f7fd7 # v1.0.1
with:
go-version: 1.22.5
aqua_version: v2.29.0
aqua_version: v2.29.1
secrets:
gh_app_id: ${{secrets.gh_app_id}}
gh_app_private_key: ${{secrets.gh_app_private_key}}
3 changes: 0 additions & 3 deletions .github/workflows/wc-integration-test.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
---
name: integration-test
on: workflow_call
env:
AQUA_DISABLE_COSIGN: "true"
AQUA_DISABLE_SLSA: "true"
jobs:
integration-test:
timeout-minutes: 30
2 changes: 1 addition & 1 deletion .github/workflows/wc-update-aqua-checksums.yaml
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
permissions:
contents: read
with:
aqua_version: v2.29.0
aqua_version: v2.29.1
prune: true
secrets:
gh_app_id: ${{secrets.gh_app_id}}
2 changes: 1 addition & 1 deletion Dockerfile-prebuilt
View file
Original file line number Diff line number Diff line change
@@ -9,5 +9,5 @@ WORKDIR /home/foo/workspace
RUN curl -sSfL -O https://raw.githubusercontent.com/aquaproj/aqua-installer/v3.0.1/aqua-installer
RUN echo "fb4b3b7d026e5aba1fc478c268e8fbd653e01404c8a8c6284fdba88ae62eda6a aqua-installer" | sha256sum -c
RUN chmod +x aqua-installer
RUN ./aqua-installer -v "v2.29.0"
RUN ./aqua-installer -v "v2.29.1"
ENV PATH=/home/foo/.local/share/aquaproj-aqua/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
10 changes: 5 additions & 5 deletions pkg/cosign/version.go
View file
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@ const Version = "v2.2.4"

func Checksums() map[string]string {
return map[string]string{
"darwin/amd64": "2429F4B027FC311A6324E9DB6FB3A937D559DC61DE906A1C2D0D1E0671685E4C",
"darwin/arm64": "3D95AB46D4C4CC55E6465758C238DC03F830CC8A1FC38BC7A33BC203E0FB2C3B",
"linux/amd64": "F669F41176CB1D58BB6A3FDB06E24861540CFDB5A571B4EC5EB2218B0DF5D304",
"linux/arm64": "B088D676F0C0123B8C348E18D421CF966020EDC4977A486115A12643DEA99A3F",
"windows/amd64": "F7F272D56C580B0EC96F59BFE9F88EC5F42B6E195DF009CE3417428E0E0DEAD1",
"darwin/amd64": "0E5A77A86115E4C00BA4243DB01ABCEACB13CC06981C45E53EE71F2E1DB8CE25",
"darwin/arm64": "FCD310E64ECDDC1EAA13FE814AC1C9FC02F6F9EACD9A58480AB8160EB8CA381E",
"linux/amd64": "97A6A1E15668A75FC4FF7A4DC4CB2F098F929CBEA2F12FAA9DE31DB6B42B17D7",
"linux/arm64": "658087351E1D4F9C396B5F59EE5437461C06128F4CE80BA899CCAA1C0B6A8A62",
"windows/amd64": "9E9B71BD3FA2A6ABFA903B5F784D9CA0FBC29C563D2B084C1A82C593C2BAB001",
}
}
5 changes: 0 additions & 5 deletions tests/cosign/aqua.yaml
View file
Original file line number Diff line number Diff line change
@@ -8,16 +8,11 @@ checksum:
registries:
- type: standard
ref: v4.203.0 # renovate: depName=aquaproj/aqua-registry
- name: local
type: local
path: registry.yaml
packages:
- name: terraform-linters/tflint
version: v0.44.1
registry: local
# https://github.com/sigstore/cosign/issues/2576
# https://github.com/aquaproj/aqua/issues/1555
# https://github.com/aquaproj/aqua/issues/1554
- name: aquaproj/aqua-installer
version: v1.1.3-3
registry: local
42 changes: 0 additions & 42 deletions tests/cosign/registry.yaml
View file

This file was deleted.