diff --git a/.circleci/config.yml b/.circleci/config.yml index a14966a495..554dfabbbc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -537,13 +537,9 @@ jobs: # Generate Kurtosis Version - run: "<>" - # Install goreleaser # we need to update the apt key, otherwise imports fails due to unrecognized key - run: | - echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - - apt update - apt install -y goreleaser # Cache our dependencies - restore_cache: diff --git a/cli/cli/scripts/build.sh b/cli/cli/scripts/build.sh index adc8474bad..0f8401c209 100755 --- a/cli/cli/scripts/build.sh +++ b/cli/cli/scripts/build.sh @@ -92,7 +92,12 @@ fi else goreleaser_verb_and_flags="build --clean --snapshot --single-target" fi - if ! GORELEASER_CURRENT_TAG=$(cat $root_dirpath/version.txt) goreleaser ${goreleaser_verb_and_flags}; then + if ! export GORELEASER_CURRENT_TAG=$(cat $root_dirpath/version.txt); then + echo "Error: Couldn't export the GORELEASER_CURRENT_TAG to set the Kurtosis version" >&2 + exit 1 + fi + # Executing goreleaser v1.26.2 without needing to install it + if ! curl -sfL https://goreleaser.com/static/run | VERSION=v1.26.2 DISTRIBUTION=oss bash -s -- ${goreleaser_verb_and_flags}; then echo "Error: Couldn't build the CLI binary for the current OS/arch" >&2 exit 1 fi diff --git a/enclave-manager/web/packages/app/src/emui/enclaves/EnclaveList.tsx b/enclave-manager/web/packages/app/src/emui/enclaves/EnclaveList.tsx index f32f281b18..a736fd8866 100644 --- a/enclave-manager/web/packages/app/src/emui/enclaves/EnclaveList.tsx +++ b/enclave-manager/web/packages/app/src/emui/enclaves/EnclaveList.tsx @@ -1,7 +1,6 @@ import { Button, ButtonGroup, Flex } from "@chakra-ui/react"; import { AppPageLayout, KurtosisAlert, PageTitle } from "kurtosis-ui-components"; import { useEffect, useMemo, useState } from "react"; -import { useExperiments } from "../experiments/ExperimentsContext"; import { BrowserRecommendator } from "./components/BrowserRecommendator"; import { KurtosisUpgrader } from "./components/KurtosisUpgrader"; import { EnclavesTable } from "./components/tables/EnclavesTable"; @@ -15,7 +14,6 @@ export const EnclaveList = () => { const [selectedEnclaves, setSelectedEnclaves] = useState([]); - const { experiments } = useExperiments(); const enclavesKey = useMemo( () => enclaves.isErr @@ -48,7 +46,7 @@ export const EnclaveList = () => { - {experiments.enableCloudVersionUpgrade && } + {enclaves.isOk && (