feat: re-enable Cosign and slsa-verifier

aquaproj · Mar 21, 2024 · 914e5c0 · 914e5c0
1 parent 463c8fc
commit 914e5c0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 27 deletions.
diff --git a/.github/workflows/actionlint.yaml b/.github/workflows/actionlint.yaml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: aquaproj/aqua-installer@fd2089d1f56724d6456f24d58605e6964deae124 # v2.3.2
         with:
-          aqua_version: v2.25.0
+          aqua_version: v2.25.1-5
         env:
           GITHUB_TOKEN: ${{ github.token }}
       - run: actionlint -ignore 'Useless cat'

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -3,9 +3,6 @@ name: test
 on:
   pull_request: {}
 permissions: {}
-env:
-  AQUA_DISABLE_COSIGN: "true"
-  AQUA_DISABLE_SLSA: "true"
 jobs:
   path-filter:
     # Get changed files to filter jobs
@@ -75,7 +72,7 @@ jobs:
       contents: read # To checkout private repository
     uses: aquaproj/update-checksum-workflow/.github/workflows/update-checksum.yaml@3598c506108a2e0e9e31a0c6ef9c202c77049420 # v0.1.9
     with:
-      aqua_version: v2.25.0
+      aqua_version: v2.25.1-5
       prune: true
     secrets:
       gh_app_id: ${{secrets.APP_ID}}
@@ -100,7 +97,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: aquaproj/aqua-installer@fd2089d1f56724d6456f24d58605e6964deae124 # v2.3.2
         with:
-          aqua_version: v2.25.0
+          aqua_version: v2.25.1-5
         env:
           AQUA_GITHUB_TOKEN: ${{github.token}}
       - run: ghalint run
@@ -131,7 +128,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: ./
         with:
-          aqua_version: v2.25.0
+          aqua_version: v2.25.1-5
           working_directory: tests
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -150,7 +147,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: ./
         with:
-          aqua_version: v2.25.0
+          aqua_version: v2.25.1-5
           working_directory: tests
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -167,7 +164,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: ./
         with:
-          aqua_version: v2.25.0
+          aqua_version: v2.25.1-5
           working_directory: tests
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -184,7 +181,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: ./
         with:
-          aqua_version: v2.25.0
+          aqua_version: v2.25.1-5
       - run: command -v aqua
         shell: bash
       - run: aqua -v
@@ -210,7 +207,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: ./
         with:
-          aqua_version: v2.25.0
+          aqua_version: v2.25.1-5
           working_directory: tests
 
       - run: command -v aqua

diff --git a/action.yaml b/action.yaml
@@ -30,12 +30,6 @@ runs:
       shell: bash
       if: inputs.aqua_version == ''
 
-    # TODO remove this step. https://github.com/aquaproj/aqua/issues/1665
-    - run: |
-        echo "AQUA_DISABLE_COSIGN=true" >> "$GITHUB_ENV"
-        echo "AQUA_DISABLE_SLSA=true" >> "$GITHUB_ENV"
-      shell: bash
-
     - run: echo "${AQUA_ROOT_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/aquaproj-aqua}/bin" >> $GITHUB_PATH
       shell: bash
       working-directory: ${{ inputs.working_directory }}

diff --git a/aqua-installer b/aqua-installer
@@ -51,16 +51,13 @@ done
 
 shift $((OPTIND - 1))
 
-export AQUA_DISABLE_COSIGN=true
-export AQUA_DISABLE_SLSA=true
-
-bootstrap_version=v2.22.0
-checksums="e66e19c3cb2da10ddeb8dfd5dc523d909e0fba87fa1337db017160fba3d90414  aqua_darwin_amd64.tar.gz
-493ab58b6b93bea2a9b9a144cac8aea90213f88b484d3de27352a2c5fb9b90e2  aqua_darwin_arm64.tar.gz
-b63d596a352d1c197c8e99342b2618a71f0ce4d6683a16578d0f2a8b2963212d  aqua_linux_amd64.tar.gz
-3b3632bfdf0527483c6219553acc4ca5b0cdceb7362f61ae4d1e2f7f77fbf6a6  aqua_linux_arm64.tar.gz
-c890463c89c6349c9e6d675ce7b8d121070bd489f78f4b68e5cbf02e4355f240  aqua_windows_amd64.zip
-b9d657a6d64ae70ddf03c296a4563526dd34d2f911cf1b62a0a708aebab11b41  aqua_windows_arm64.zip"
+bootstrap_version=v2.25.1-5
+checksums="26b89ce022795b25e342f14d2ee1cdacdde0d57d1650b403e48938b917d84645  aqua_darwin_amd64.tar.gz
+e9a59d4ce33327f72027786c39f2b60ba33683cf89fc48e6231beaf482b59e6d  aqua_darwin_arm64.tar.gz
+bcb35348205f572bfb310e0cc9bd5279166754447e83acec17de9b289bf0c2a1  aqua_linux_amd64.tar.gz
+8ff03737b43ed63bc9bccb36c5957fff62f93f23f18d523bf715e3b5732a3eb9  aqua_linux_arm64.tar.gz
+10d8662b13531d3c04f295ab65808a0fa4a629af453444159659dc318ea3f0f8  aqua_windows_amd64.zip
+88b50806832d7a0ded5cbc4d2eca9c22f9e19e06ef2f7ce76a47fbd8f0be7ce8  aqua_windows_arm64.zip"
 
 filename=aqua_${OS}_${ARCH}.tar.gz
 if [ "$OS" = windows ]; then