From e177c7bac0309bfad417fba3ab84c47cbc7a4870 Mon Sep 17 00:00:00 2001 From: Benoit Ranque Date: Tue, 19 Mar 2024 22:19:39 -0400 Subject: [PATCH] correct artifacts --- .github/workflows/deploy-stage.yaml | 8 +------- ci/scripts/generate-connector-definition.sh | 2 +- ci/scripts/generate-manifest.sh | 10 +++++----- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy-stage.yaml b/.github/workflows/deploy-stage.yaml index daa23ee..9ffb164 100644 --- a/.github/workflows/deploy-stage.yaml +++ b/.github/workflows/deploy-stage.yaml @@ -152,12 +152,6 @@ jobs: path: release/artifacts merge-multiple: true - - name: generate SHA-256 checksums - run: | - cd release/artifacts - sha256sum * > ./sha256sum - cat ./sha256sum - - name: generate CLI manifest run: | export CLI_VERSION="$GITHUB_REF_NAME" @@ -178,7 +172,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: connector-definition.tgz - path: ./release/connector-definition.tgz + path: ./release/artifacts/connector-definition.tgz compression-level: 0 # Already compressed - name: Get version from tag diff --git a/ci/scripts/generate-connector-definition.sh b/ci/scripts/generate-connector-definition.sh index 4b7c813..5226859 100755 --- a/ci/scripts/generate-connector-definition.sh +++ b/ci/scripts/generate-connector-definition.sh @@ -5,4 +5,4 @@ ROOT="$(pwd)" mkdir -p "${ROOT}/release/connector-definition/.hasura-connector/" cat "${ROOT}/ci/templates/connector-metadata.yaml" | envsubst > "${ROOT}/release/connector-definition/.hasura-connector/connector-metadata.yaml" -tar -czvf "${ROOT}/release/connector-definition.tgz" "${ROOT}/release/connector-definition/" \ No newline at end of file +tar -czvf "${ROOT}/release/artifacts/connector-definition.tgz" "${ROOT}/release/connector-definition/" \ No newline at end of file diff --git a/ci/scripts/generate-manifest.sh b/ci/scripts/generate-manifest.sh index f992f72..1b6b03c 100755 --- a/ci/scripts/generate-manifest.sh +++ b/ci/scripts/generate-manifest.sh @@ -3,11 +3,11 @@ set -evo pipefail ROOT="$(pwd)" -export LINUX_AMD64_SHA256=$(cat ${ROOT}/release/artifacts/sha256sum | grep ndc-clickhouse-cli-x86_64-unknown-linux-musl | cut -f1 -d' ') -export MACOS_AMD64_SHA256=$(cat ${ROOT}/release/artifacts/sha256sum | grep ndc-clickhouse-cli-x86_64-apple-darwin | cut -f1 -d' ') -export WINDOWS_AMD64_SHA256=$(cat ${ROOT}/release/artifacts/sha256sum | grep ndc-clickhouse-cli-x86_64-pc-windows-msvc.exe | cut -f1 -d' ') -export LINUX_ARM64_SHA256=$(cat ${ROOT}/release/artifacts/sha256sum | grep ndc-clickhouse-cli-aarch64-unknown-linux-musl | cut -f1 -d' ') -export MACOS_ARM64_SHA256=$(cat ${ROOT}/release/artifacts/sha256sum | grep ndc-clickhouse-cli-aarch64-apple-darwin | cut -f1 -d' ') +export LINUX_AMD64_SHA256=$(sha256sum ${ROOT}/release/artifacts/ndc-clickhouse-cli-x86_64-unknown-linux-musl | cut -f1 -d' ') +export MACOS_AMD64_SHA256=$(sha256sum ${ROOT}/release/artifacts/ndc-clickhouse-cli-x86_64-apple-darwin | cut -f1 -d' ') +export WINDOWS_AMD64_SHA256=$(sha256sum ${ROOT}/release/artifacts/ndc-clickhouse-cli-x86_64-pc-windows-msvc.exe | cut -f1 -d' ') +export LINUX_ARM64_SHA256=$(sha256sum ${ROOT}/release/artifacts/ndc-clickhouse-cli-aarch64-unknown-linux-musl | cut -f1 -d' ') +export MACOS_ARM64_SHA256=$(sha256sum ${ROOT}/release/artifacts/ndc-clickhouse-cli-aarch64-apple-darwin | cut -f1 -d' ') mkdir -p "${ROOT}/release/" cat "${ROOT}/ci/templates/manifest.yaml" | envsubst > "${ROOT}/release/manifest.yaml"