From 9d36fff7dfae995981835518f452e1d6954f4e79 Mon Sep 17 00:00:00 2001 From: Javier Rodriguez Date: Thu, 10 Apr 2025 10:44:11 +0200 Subject: [PATCH 1/4] chore(install.sh): Replace URL to download install.sh Signed-off-by: Javier Rodriguez --- .github/workflows/chainloop_contract_sync.yml | 2 +- tools/c8l | 2 +- tools/src/lib/chainloop.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/chainloop_contract_sync.yml b/.github/workflows/chainloop_contract_sync.yml index 9cd6e88..4779bd5 100644 --- a/.github/workflows/chainloop_contract_sync.yml +++ b/.github/workflows/chainloop_contract_sync.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Install Chainloop run: | - curl -sfL https://raw.githubusercontent.com/chainloop-dev/chainloop/01ad13af08950b7bfbc83569bea207aeb4e1a285/docs/static/install.sh | bash -s -- --version v${{ env.CHAINLOOP_VERSION }} + curl -sfL https://docs.chainloop.dev/install.sh | bash -s -- --version v${{ env.CHAINLOOP_VERSION }} - name: Checkout repository uses: actions/checkout@v4.1.4 diff --git a/tools/c8l b/tools/c8l index bbb48e6..64ffd32 100755 --- a/tools/c8l +++ b/tools/c8l @@ -617,7 +617,7 @@ chainloop_bin_install() { install_chainloop_cli() { mkdir -p ${CHAINLOOP_TMP_DIR} $CHAINLOOP_BIN_PATH log "Installing Chainloop CLI" - url_chainloop_cli="https://raw.githubusercontent.com/chainloop-dev/chainloop/eb53f4e8ce3c35251553efc77b7e04e792b2c992/docs/static/install.sh" + url_chainloop_cli="https://docs.chainloop.dev/install.sh" if [ -n "${CHAINLOOP_VERSION}" ]; then curl -sfL "${url_chainloop_cli}" | bash -s -- --version v${CHAINLOOP_VERSION} --path $CHAINLOOP_BIN_PATH else diff --git a/tools/src/lib/chainloop.sh b/tools/src/lib/chainloop.sh index 1ce7f94..28ec0bd 100644 --- a/tools/src/lib/chainloop.sh +++ b/tools/src/lib/chainloop.sh @@ -33,7 +33,7 @@ chainloop_bin_install() { install_chainloop_cli() { mkdir -p ${CHAINLOOP_TMP_DIR} $CHAINLOOP_BIN_PATH log "Installing Chainloop CLI" - url_chainloop_cli="https://raw.githubusercontent.com/chainloop-dev/chainloop/eb53f4e8ce3c35251553efc77b7e04e792b2c992/docs/static/install.sh" + url_chainloop_cli="https://docs.chainloop.dev/install.sh" if [ -n "${CHAINLOOP_VERSION}" ]; then curl -sfL "${url_chainloop_cli}" | bash -s -- --version v${CHAINLOOP_VERSION} --path $CHAINLOOP_BIN_PATH else From ebd0f4ea6d616f16fe0cd7d60488eba28089309d Mon Sep 17 00:00:00 2001 From: Javier Rodriguez Date: Thu, 10 Apr 2025 11:05:56 +0200 Subject: [PATCH 2/4] test different install.sh Signed-off-by: Javier Rodriguez --- tools/c8l | 2 +- tools/src/lib/chainloop.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/c8l b/tools/c8l index 64ffd32..c7bc412 100755 --- a/tools/c8l +++ b/tools/c8l @@ -617,7 +617,7 @@ chainloop_bin_install() { install_chainloop_cli() { mkdir -p ${CHAINLOOP_TMP_DIR} $CHAINLOOP_BIN_PATH log "Installing Chainloop CLI" - url_chainloop_cli="https://docs.chainloop.dev/install.sh" + url_chainloop_cli="https://gist.githubusercontent.com/javirln/01cfcb36f00668ad1af9e5c02acd1397/raw/f8a271180ed8e5a307fd6c6f2bfbf18c9f30b916/install.sh" if [ -n "${CHAINLOOP_VERSION}" ]; then curl -sfL "${url_chainloop_cli}" | bash -s -- --version v${CHAINLOOP_VERSION} --path $CHAINLOOP_BIN_PATH else diff --git a/tools/src/lib/chainloop.sh b/tools/src/lib/chainloop.sh index 28ec0bd..958d88f 100644 --- a/tools/src/lib/chainloop.sh +++ b/tools/src/lib/chainloop.sh @@ -33,7 +33,7 @@ chainloop_bin_install() { install_chainloop_cli() { mkdir -p ${CHAINLOOP_TMP_DIR} $CHAINLOOP_BIN_PATH log "Installing Chainloop CLI" - url_chainloop_cli="https://docs.chainloop.dev/install.sh" + url_chainloop_cli="https://gist.githubusercontent.com/javirln/01cfcb36f00668ad1af9e5c02acd1397/raw/f8a271180ed8e5a307fd6c6f2bfbf18c9f30b916/install.sh" if [ -n "${CHAINLOOP_VERSION}" ]; then curl -sfL "${url_chainloop_cli}" | bash -s -- --version v${CHAINLOOP_VERSION} --path $CHAINLOOP_BIN_PATH else From 4e859a0bc9095ab4a748c2f08f7cf9ba35f54159 Mon Sep 17 00:00:00 2001 From: Javier Rodriguez Date: Thu, 10 Apr 2025 11:07:03 +0200 Subject: [PATCH 3/4] restore install.sh Signed-off-by: Javier Rodriguez --- tools/c8l | 2 +- tools/src/lib/chainloop.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/c8l b/tools/c8l index c7bc412..64ffd32 100755 --- a/tools/c8l +++ b/tools/c8l @@ -617,7 +617,7 @@ chainloop_bin_install() { install_chainloop_cli() { mkdir -p ${CHAINLOOP_TMP_DIR} $CHAINLOOP_BIN_PATH log "Installing Chainloop CLI" - url_chainloop_cli="https://gist.githubusercontent.com/javirln/01cfcb36f00668ad1af9e5c02acd1397/raw/f8a271180ed8e5a307fd6c6f2bfbf18c9f30b916/install.sh" + url_chainloop_cli="https://docs.chainloop.dev/install.sh" if [ -n "${CHAINLOOP_VERSION}" ]; then curl -sfL "${url_chainloop_cli}" | bash -s -- --version v${CHAINLOOP_VERSION} --path $CHAINLOOP_BIN_PATH else diff --git a/tools/src/lib/chainloop.sh b/tools/src/lib/chainloop.sh index 958d88f..28ec0bd 100644 --- a/tools/src/lib/chainloop.sh +++ b/tools/src/lib/chainloop.sh @@ -33,7 +33,7 @@ chainloop_bin_install() { install_chainloop_cli() { mkdir -p ${CHAINLOOP_TMP_DIR} $CHAINLOOP_BIN_PATH log "Installing Chainloop CLI" - url_chainloop_cli="https://gist.githubusercontent.com/javirln/01cfcb36f00668ad1af9e5c02acd1397/raw/f8a271180ed8e5a307fd6c6f2bfbf18c9f30b916/install.sh" + url_chainloop_cli="https://docs.chainloop.dev/install.sh" if [ -n "${CHAINLOOP_VERSION}" ]; then curl -sfL "${url_chainloop_cli}" | bash -s -- --version v${CHAINLOOP_VERSION} --path $CHAINLOOP_BIN_PATH else From e4f4acb9c3316d3ff100b2e96e44a91e187b37ef Mon Sep 17 00:00:00 2001 From: Javier Rodriguez Date: Thu, 10 Apr 2025 11:10:51 +0200 Subject: [PATCH 4/4] update tests Signed-off-by: Javier Rodriguez --- tools/test/test.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/test/test.bats b/tools/test/test.bats index fc3ae95..b9d8fb4 100644 --- a/tools/test/test.bats +++ b/tools/test/test.bats @@ -62,8 +62,8 @@ setup() { # Abats test_tags=bats:focus @test "full attestation flow" { - export CHAINLOOP_WORKFLOW_NAME="chainloop-labs-tests" - export CHAINLOOP_PROJECT_NAME="chainloop" + export CHAINLOOP_WORKFLOW_NAME="labs-tests" + export CHAINLOOP_PROJECT_NAME="labs" cp ./c8l /tmp cd /tmp mkdir -p .c8l_cache