From 7b814e723b475bb09aeb6548f89b5d9e0f87c3de Mon Sep 17 00:00:00 2001 From: gregnuj Date: Fri, 5 Jan 2024 06:49:57 -0600 Subject: [PATCH] modify go version for chihuahua --- .github/workflows/chihuahua-build.yml | 2 +- alpine.Dockerfile | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/chihuahua-build.yml b/.github/workflows/chihuahua-build.yml index 508dd0d..0a8e0f3 100644 --- a/.github/workflows/chihuahua-build.yml +++ b/.github/workflows/chihuahua-build.yml @@ -56,7 +56,7 @@ jobs: binary: "chihuahuad" build_command: "make install" chain_registry_name: "chihuahua" - go_version: "1.21" + go_version: "1.20.10" repo: "ChihuahuaChain/chihuahua" os: "linux" arch: "amd64" diff --git a/alpine.Dockerfile b/alpine.Dockerfile index 8835772..6160894 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -46,13 +46,13 @@ SHELL [ "/bin/bash", "-c" ] RUN set -e && \ git clone -b ${GIT_TAG} https://github.com/${GIT_REPO}.git ./ && \ - export GO_MOD_VERSION="$(awk '/^go /{print $2}' go.mod)" && \ - if [[ "${GO_VERSION}" != "${GO_MOD_VERSION}"* ]]; then \ - /bin/bash < <(curl -sSL https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) && \ - source ${HOME}/.gvm/scripts/gvm && \ - gvm install go${GO_MOD_VERSION} && \ - gvm use go${GO_MOD_VERSION}; \ - fi && \ + # export GO_MOD_VERSION="$(awk '/^go /{print $2}' go.mod)" && \ + # if [[ "${GO_VERSION}" != "${GO_MOD_VERSION}"* ]]; then \ + # /bin/bash < <(curl -sSL https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) && \ + # source ${HOME}/.gvm/scripts/gvm && \ + # gvm install go${GO_MOD_VERSION} && \ + # gvm use go${GO_MOD_VERSION}; \ + # fi && \ go mod download -x || true # download wasmvm if version is specified