From 0a66c7b1d3690e595f47d117ac4175e9124bc957 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 21:11:59 +0900 Subject: [PATCH 01/21] test aqua update-checksum --- .circleci/config.yml | 15 +++------------ aqua.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b36d28..b6eb495 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - aqua: aquaproj/aqua@0.3.0 + aqua: aquaproj/aqua@dev:pr-359 workflows: build: @@ -17,14 +17,5 @@ jobs: apk add git curl bash - checkout - aqua/aqua: - aqua_version: v2.9.0 - aqua_log_level: debug - aqua_config: aqua.yaml - aqua_only_link: false - aqua_all: true - aqua_exclude_tags: foo,bar - - run: - shell: /bin/bash -euo pipefail - command: | - command -v circleci - circleci version + aqua_version: v2.9.1 + - aqua/update-checksum diff --git a/aqua.yaml b/aqua.yaml index cf8102c..c761799 100644 --- a/aqua.yaml +++ b/aqua.yaml @@ -1,13 +1,13 @@ --- # aqua - Declarative CLI Version Manager # https://aquaproj.github.io/ -# checksum: -# enabled: true -# require_checksum: true +checksum: + enabled: true + require_checksum: true # supported_envs: # - all registries: - type: standard ref: v4.27.0 # renovate: depName=aquaproj/aqua-registry packages: -- name: CircleCI-Public/circleci-cli@v0.1.27054 +- name: int128/ghcp@v1.13.2 From c171f1909bb4f3ddbe45194aa6d48d8408a88744 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 21:17:19 +0900 Subject: [PATCH 02/21] use debian --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b6eb495..9903e07 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,11 +10,12 @@ workflows: jobs: foo: docker: - - image: alpine:3.18.2 + - image: debian:12.0 steps: - run: command: | - apk add git curl bash + apt update -y + apt install git curl - checkout - aqua/aqua: aqua_version: v2.9.1 From e497ca68ab0542e055859297693c7eea247217b3 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 21:18:17 +0900 Subject: [PATCH 03/21] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9903e07..1be4304 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: - run: command: | apt update -y - apt install git curl + apt install -y git curl - checkout - aqua/aqua: aqua_version: v2.9.1 From b9dd28652ad0ca0025e42f6b3b846664d5296a3b Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 21:19:09 +0900 Subject: [PATCH 04/21] update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1be4304..c46b6ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,5 +18,5 @@ jobs: apt install -y git curl - checkout - aqua/aqua: - aqua_version: v2.9.1 + aqua_version: v2.10.0-1 - aqua/update-checksum From 747083243c72beb83fecd2b5e1ae51c3c2bb1f63 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 21:27:21 +0900 Subject: [PATCH 05/21] test skip_push --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c46b6ba..f7d9a3c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,4 +19,5 @@ jobs: - checkout - aqua/aqua: aqua_version: v2.10.0-1 - - aqua/update-checksum + - aqua/update-checksum: + skip_push: true From cf737ea139bf219234867f888182baafca0a7df4 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 21:28:27 +0900 Subject: [PATCH 06/21] test --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f7d9a3c..c46b6ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,5 +19,4 @@ jobs: - checkout - aqua/aqua: aqua_version: v2.10.0-1 - - aqua/update-checksum: - skip_push: true + - aqua/update-checksum From 855a05f429248495f34f1cfcd9c106820dc8a45e Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 21:45:15 +0900 Subject: [PATCH 07/21] chore(aqua): update checksum files --- aqua-checksums.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 aqua-checksums.json diff --git a/aqua-checksums.json b/aqua-checksums.json new file mode 100644 index 0000000..b864001 --- /dev/null +++ b/aqua-checksums.json @@ -0,0 +1,24 @@ +{ + "checksums": [ + { + "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_darwin_amd64.zip", + "checksum": "8221F411AC4F2465B7CFD31EFB6DA4568E5FD20BAD9F66AC312B23AFA4520FDD", + "algorithm": "sha256" + }, + { + "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_linux_amd64.zip", + "checksum": "6B9D9C9A7B834237B6579353477DF3BB3730C11788170AD2A9E5D1230ABC6216", + "algorithm": "sha256" + }, + { + "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_windows_amd64.zip", + "checksum": "2297D27978C61272184589C3C521514291E6258C3C87EBCB16FB61B32663414E", + "algorithm": "sha256" + }, + { + "id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.27.0/registry.yaml", + "checksum": "AF0F0204D98A101A1F0CAD9834211E4AE329685FA9455B4BB650FE0B1C788493F65BA0440FF8F8FE91032CB0D91ED3F4A7C1742A76E1232D29457399F9854302", + "algorithm": "sha512" + } + ] +} From 192c199e4781d462994b08bf31a4704cbc85fc04 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 22:54:46 +0900 Subject: [PATCH 08/21] update --- aqua-checksums.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/aqua-checksums.json b/aqua-checksums.json index b864001..8b6411d 100644 --- a/aqua-checksums.json +++ b/aqua-checksums.json @@ -1,10 +1,5 @@ { "checksums": [ - { - "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_darwin_amd64.zip", - "checksum": "8221F411AC4F2465B7CFD31EFB6DA4568E5FD20BAD9F66AC312B23AFA4520FDD", - "algorithm": "sha256" - }, { "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_linux_amd64.zip", "checksum": "6B9D9C9A7B834237B6579353477DF3BB3730C11788170AD2A9E5D1230ABC6216", From 89796fa7bb7eea8ef550b41c4c087d27f4e25ca5 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 22:56:39 +0900 Subject: [PATCH 09/21] update --- foo/aqua-checksums.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 foo/aqua-checksums.json diff --git a/foo/aqua-checksums.json b/foo/aqua-checksums.json new file mode 100644 index 0000000..8b6411d --- /dev/null +++ b/foo/aqua-checksums.json @@ -0,0 +1,19 @@ +{ + "checksums": [ + { + "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_linux_amd64.zip", + "checksum": "6B9D9C9A7B834237B6579353477DF3BB3730C11788170AD2A9E5D1230ABC6216", + "algorithm": "sha256" + }, + { + "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_windows_amd64.zip", + "checksum": "2297D27978C61272184589C3C521514291E6258C3C87EBCB16FB61B32663414E", + "algorithm": "sha256" + }, + { + "id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.27.0/registry.yaml", + "checksum": "AF0F0204D98A101A1F0CAD9834211E4AE329685FA9455B4BB650FE0B1C788493F65BA0440FF8F8FE91032CB0D91ED3F4A7C1742A76E1232D29457399F9854302", + "algorithm": "sha512" + } + ] +} From 32843f36b63617f137ff8a72c5fab6f17ee6b9a5 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 22:57:04 +0900 Subject: [PATCH 10/21] chore(aqua): update checksum files --- aqua-checksums.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aqua-checksums.json b/aqua-checksums.json index 8b6411d..b864001 100644 --- a/aqua-checksums.json +++ b/aqua-checksums.json @@ -1,5 +1,10 @@ { "checksums": [ + { + "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_darwin_amd64.zip", + "checksum": "8221F411AC4F2465B7CFD31EFB6DA4568E5FD20BAD9F66AC312B23AFA4520FDD", + "algorithm": "sha256" + }, { "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_linux_amd64.zip", "checksum": "6B9D9C9A7B834237B6579353477DF3BB3730C11788170AD2A9E5D1230ABC6216", From c1e33b05f52282e5652eec0a93bc0ec19dc4a963 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 22:58:39 +0900 Subject: [PATCH 11/21] update --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c46b6ba..54bc287 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,4 +19,5 @@ jobs: - checkout - aqua/aqua: aqua_version: v2.10.0-1 - - aqua/update-checksum + - aqua/update-checksum: + working_directory: foo From 561cb82f4f87f4b9f12af3fd26e9d447c591cd70 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 23:00:12 +0900 Subject: [PATCH 12/21] update --- foo/aqua.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 foo/aqua.yaml diff --git a/foo/aqua.yaml b/foo/aqua.yaml new file mode 100644 index 0000000..c761799 --- /dev/null +++ b/foo/aqua.yaml @@ -0,0 +1,13 @@ +--- +# aqua - Declarative CLI Version Manager +# https://aquaproj.github.io/ +checksum: + enabled: true + require_checksum: true +# supported_envs: +# - all +registries: +- type: standard + ref: v4.27.0 # renovate: depName=aquaproj/aqua-registry +packages: +- name: int128/ghcp@v1.13.2 From 7badfb44358a50c73d7b42fe93af9e40280699d9 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 23:03:28 +0900 Subject: [PATCH 13/21] chore(aqua): update checksum files --- foo/aqua-checksums.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/foo/aqua-checksums.json b/foo/aqua-checksums.json index 8b6411d..b864001 100644 --- a/foo/aqua-checksums.json +++ b/foo/aqua-checksums.json @@ -1,5 +1,10 @@ { "checksums": [ + { + "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_darwin_amd64.zip", + "checksum": "8221F411AC4F2465B7CFD31EFB6DA4568E5FD20BAD9F66AC312B23AFA4520FDD", + "algorithm": "sha256" + }, { "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_linux_amd64.zip", "checksum": "6B9D9C9A7B834237B6579353477DF3BB3730C11788170AD2A9E5D1230ABC6216", From f4df9b1d7994d3f8798f38ef0d3842f049c07433 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 23:04:34 +0900 Subject: [PATCH 14/21] update --- .circleci/config.yml | 3 +-- aqua-checksums.json | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 54bc287..c46b6ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,5 +19,4 @@ jobs: - checkout - aqua/aqua: aqua_version: v2.10.0-1 - - aqua/update-checksum: - working_directory: foo + - aqua/update-checksum diff --git a/aqua-checksums.json b/aqua-checksums.json index b864001..8b6411d 100644 --- a/aqua-checksums.json +++ b/aqua-checksums.json @@ -1,10 +1,5 @@ { "checksums": [ - { - "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_darwin_amd64.zip", - "checksum": "8221F411AC4F2465B7CFD31EFB6DA4568E5FD20BAD9F66AC312B23AFA4520FDD", - "algorithm": "sha256" - }, { "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_linux_amd64.zip", "checksum": "6B9D9C9A7B834237B6579353477DF3BB3730C11788170AD2A9E5D1230ABC6216", From b50b88238d3b85644a2cf7db2ab9f7dea81f9755 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 23:04:58 +0900 Subject: [PATCH 15/21] chore(aqua): update checksum files --- aqua-checksums.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aqua-checksums.json b/aqua-checksums.json index 8b6411d..b864001 100644 --- a/aqua-checksums.json +++ b/aqua-checksums.json @@ -1,5 +1,10 @@ { "checksums": [ + { + "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_darwin_amd64.zip", + "checksum": "8221F411AC4F2465B7CFD31EFB6DA4568E5FD20BAD9F66AC312B23AFA4520FDD", + "algorithm": "sha256" + }, { "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_linux_amd64.zip", "checksum": "6B9D9C9A7B834237B6579353477DF3BB3730C11788170AD2A9E5D1230ABC6216", From 6a1cbbb7a0a01f87b5a68dcda235e3a9ed4817db Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 23:21:22 +0900 Subject: [PATCH 16/21] test --- .circleci/config.yml | 8 ++++++-- foo/aqua-checksums.json | 5 ----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c46b6ba..c587a81 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,11 @@ jobs: command: | apt update -y apt install -y git curl - - checkout + - checkout: + path: yoo - aqua/aqua: aqua_version: v2.10.0-1 - - aqua/update-checksum + working_directory: yoo + - aqua/update-checksum: + git_root_directory: yoo + working_directory: yoo/foo diff --git a/foo/aqua-checksums.json b/foo/aqua-checksums.json index b864001..d1cb29d 100644 --- a/foo/aqua-checksums.json +++ b/foo/aqua-checksums.json @@ -5,11 +5,6 @@ "checksum": "8221F411AC4F2465B7CFD31EFB6DA4568E5FD20BAD9F66AC312B23AFA4520FDD", "algorithm": "sha256" }, - { - "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_linux_amd64.zip", - "checksum": "6B9D9C9A7B834237B6579353477DF3BB3730C11788170AD2A9E5D1230ABC6216", - "algorithm": "sha256" - }, { "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_windows_amd64.zip", "checksum": "2297D27978C61272184589C3C521514291E6258C3C87EBCB16FB61B32663414E", From 88a102af9fd074dbc12b009b470645f44af423f4 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 22 Jul 2023 23:21:46 +0900 Subject: [PATCH 17/21] chore(aqua): update checksum files --- foo/aqua-checksums.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/foo/aqua-checksums.json b/foo/aqua-checksums.json index d1cb29d..b864001 100644 --- a/foo/aqua-checksums.json +++ b/foo/aqua-checksums.json @@ -5,6 +5,11 @@ "checksum": "8221F411AC4F2465B7CFD31EFB6DA4568E5FD20BAD9F66AC312B23AFA4520FDD", "algorithm": "sha256" }, + { + "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_linux_amd64.zip", + "checksum": "6B9D9C9A7B834237B6579353477DF3BB3730C11788170AD2A9E5D1230ABC6216", + "algorithm": "sha256" + }, { "id": "github_release/github.com/int128/ghcp/v1.13.2/ghcp_windows_amd64.zip", "checksum": "2297D27978C61272184589C3C521514291E6258C3C87EBCB16FB61B32663414E", From 0a6705387f6c1e4ee1e521d70358d49ac2668d80 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 23 Jul 2023 10:54:52 +0900 Subject: [PATCH 18/21] update --- .circleci/config.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c587a81..adac041 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,11 +16,6 @@ jobs: command: | apt update -y apt install -y git curl - - checkout: - path: yoo + - checkout - aqua/aqua: aqua_version: v2.10.0-1 - working_directory: yoo - - aqua/update-checksum: - git_root_directory: yoo - working_directory: yoo/foo From 04d2084a6295134c412fd532e8372306955245d7 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 23 Jul 2023 10:56:06 +0900 Subject: [PATCH 19/21] test --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index adac041..c46b6ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,3 +19,4 @@ jobs: - checkout - aqua/aqua: aqua_version: v2.10.0-1 + - aqua/update-checksum From 9cb42ea772bae02d24773b1c029a506107a6c412 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 23 Jul 2023 10:56:51 +0900 Subject: [PATCH 20/21] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c46b6ba..08bf156 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,5 +18,5 @@ jobs: apt install -y git curl - checkout - aqua/aqua: - aqua_version: v2.10.0-1 + aqua_version: v2.10.0 - aqua/update-checksum From 6e57235d9d2a2e2969fdf650ec31a282efa9ff65 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sun, 23 Jul 2023 11:05:32 +0900 Subject: [PATCH 21/21] update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 08bf156..5a16714 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - aqua: aquaproj/aqua@dev:pr-359 + aqua: aquaproj/aqua@0.3.1 workflows: build: