feat: re-enable Cosign and slsa-verifier (#610)

* feat: re-enable Cosign and slsa-verifier * chore: update the bootstrap version to v2.25.1 * chore: update aqua to v2.25.1
aquaproj · Mar 22, 2024 · 4551ec6 · 4551ec6
1 parent 4f69912
commit 4551ec6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
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

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 }}
@@ -91,13 +85,13 @@ runs:
         	install_path=${AQUA_ROOT_DIR:-$HOME/AppData/Local/aquaproj-aqua}/bin/aqua.exe
         fi
 
-        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
+        checksums="791df099b6491a212ac5996580c6851fa1fa843c430160cf897b5cee4d49cd67  aqua_darwin_amd64.tar.gz
+        96cad04547f0a32687a92d82f2bf8d256ade93cd1ac43373e189edc79dff12bc  aqua_darwin_arm64.tar.gz
+        4f33be343873ace8fa448193c4e00f9c2bd467daa34abbdb2c3a57aa344bc43d  aqua_linux_amd64.tar.gz
+        a929dad9cc6c841aff02712392a5d4898d7d935f5085ccfaaf637d6784aab28a  aqua_linux_arm64.tar.gz
+        fe6bfe3ae93cb4715b3887e3c595d066a1c696a2852d9efa649487db609df31f  aqua_windows_amd64.zip
+        c34dc6e0329c5e693f125b1285b137589bd8783ff57ce36219ad63f6e1665ae0  aqua_windows_arm64.zip"
 
         filename=aqua_${OS}_${ARCH}.tar.gz
         if [ "$OS" = windows ]; then

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
+checksums="791df099b6491a212ac5996580c6851fa1fa843c430160cf897b5cee4d49cd67  aqua_darwin_amd64.tar.gz
+96cad04547f0a32687a92d82f2bf8d256ade93cd1ac43373e189edc79dff12bc  aqua_darwin_arm64.tar.gz
+4f33be343873ace8fa448193c4e00f9c2bd467daa34abbdb2c3a57aa344bc43d  aqua_linux_amd64.tar.gz
+a929dad9cc6c841aff02712392a5d4898d7d935f5085ccfaaf637d6784aab28a  aqua_linux_arm64.tar.gz
+fe6bfe3ae93cb4715b3887e3c595d066a1c696a2852d9efa649487db609df31f  aqua_windows_amd64.zip
+c34dc6e0329c5e693f125b1285b137589bd8783ff57ce36219ad63f6e1665ae0  aqua_windows_arm64.zip"
 
 filename=aqua_${OS}_${ARCH}.tar.gz
 if [ "$OS" = windows ]; then