From d1a0c9685aa92eee66fc626114c509ecc1577d9d Mon Sep 17 00:00:00 2001 From: gregnuj Date: Wed, 27 Sep 2023 08:21:49 -0500 Subject: [PATCH] rever terra to 2.4, fix typo --- .github/workflows/docker-build.yml | 170 ++++++++++++++--------------- arch.Dockerfile | 2 +- builds/terra.2.4.1.alpine.sh | 2 +- builds/terra.2.4.1.arch.sh | 2 +- devnets/bin/init-chain | 2 +- devnets/env/terra.env | 2 +- 6 files changed, 90 insertions(+), 90 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 26378af..b0ed982 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -1,91 +1,91 @@ name: docker-build on: - workflow_call: - inputs: - binary: - description: "Name of the binary" - required: true - type: string - build_command: - description: "Build command" - type: string - required: false - default: "make install" - build_tags: - description: "Build tags" - type: string - required: false - default: "netgo ledger muslc" - chain_registry_name: - description: "Name of the application" - required: true - type: string - cosmos_build_options: - description: "Cosmos build options" - type: string - required: false - default: "" - denom: - description: "Denom" - type: string - required: false - default: "" - go_version: - description: "Go version" - type: string - required: false - default: "1.20" - ldflags: - description: "Ldflags" - type: string - required: false - default: "-w -s -linkmode=external -extldflags \"-Wl,-z,muldefs -static\"" - mimalloc_version: - description: "Mimalloc version" - required: false - type: string - default: "" - name: - description: "Name of the application" - required: true - type: string - os: - description: "Os type linux,darwin etc" - required: false - type: string - default: "linux" - arch: - description: "Architecture" - required: false - type: string - default: "amd64" - distro: - description: "Linux distribution" - required: true - type: string - platform: - description: "Platform" - required: true - type: string - repo: - description: "Repo" - required: true - type: string - repo_tag: - description: "Tag" - required: False - type: string - default: "" - target: - description: "Target" - required: false - type: string - default: "prod" - version: - description: "Version" - required: true - type: string + workflow_call: + inputs: + binary: + description: "Name of the binary" + required: true + type: string + build_command: + description: "Build command" + type: string + required: false + default: "make install" + build_tags: + description: "Build tags" + type: string + required: false + default: "netgo ledger muslc" + chain_registry_name: + description: "Name of the application" + required: true + type: string + cosmos_build_options: + description: "Cosmos build options" + type: string + required: false + default: "" + denom: + description: "Denom" + type: string + required: false + default: "" + go_version: + description: "Go version" + type: string + required: false + default: "1.20" + ldflags: + description: "Ldflags" + type: string + required: false + default: "-w -s -linkmode=external -extldflags \"-Wl,-z,muldefs -static\"" + mimalloc_version: + description: "Mimalloc version" + required: false + type: string + default: "" + name: + description: "Name of the application" + required: true + type: string + os: + description: "Os type linux,darwin etc" + required: false + type: string + default: "linux" + arch: + description: "Architecture" + required: false + type: string + default: "amd64" + distro: + description: "Linux distribution" + required: true + type: string + platform: + description: "Platform" + required: true + type: string + repo: + description: "Repo" + required: true + type: string + repo_tag: + description: "Tag" + required: False + type: string + default: "" + target: + description: "Target" + required: false + type: string + default: "prod" + version: + description: "Version" + required: true + type: string jobs: build: diff --git a/arch.Dockerfile b/arch.Dockerfile index 454137b..5e0fe9b 100644 --- a/arch.Dockerfile +++ b/arch.Dockerfile @@ -13,7 +13,7 @@ ARG GO_VERSION="1.20.8" # # NOTE: add libusb-dev to run with LEDGER_ENABLED=true RUN set -eu & \ - pacman -Syyu --noconfirm linux-headers base-devel glibc git && \ + pacman -Syyu --noconfirm linux-headers base-devel glibc git bc && \ curl -sSL https://go.dev/dl/go${GO_VERSION}.${OS}-${ARCH}.tar.gz | \ tar -C / -xz && \ ln -s /go/bin/go /usr/local/bin/go diff --git a/builds/terra.2.4.1.alpine.sh b/builds/terra.2.4.1.alpine.sh index d6d7a6d..593dfe6 100755 --- a/builds/terra.2.4.1.alpine.sh +++ b/builds/terra.2.4.1.alpine.sh @@ -5,7 +5,7 @@ DOCKER_DIR="${BASEDIR}/.." IMAGE="alpine" NAME="terra" REPO="terra-money/core" -TAG="2.5.0-rc5" +TAG="2.4.1" GO_VERSION="1.20" cd "${DOCKER_DIR}" diff --git a/builds/terra.2.4.1.arch.sh b/builds/terra.2.4.1.arch.sh index 154b170..40e9b04 100755 --- a/builds/terra.2.4.1.arch.sh +++ b/builds/terra.2.4.1.arch.sh @@ -5,7 +5,7 @@ DOCKER_DIR="${BASEDIR}/.." IMAGE="arch" NAME="terra" REPO="terra-money/core" -TAG="2.5.0-rc5" +TAG="2.4.1" GO_VERSION="1.20" cd "${DOCKER_DIR}" diff --git a/devnets/bin/init-chain b/devnets/bin/init-chain index 09e9092..309bca9 100755 --- a/devnets/bin/init-chain +++ b/devnets/bin/init-chain @@ -19,7 +19,7 @@ if [ -f ${HOME}/.env ]; then fi # Cosmos SDK v0.47 settings -if ${BIN_NAME} version --long | grep 'cosmos_sdk_version: v0.47]'; then +if ${BIN_NAME} version --long | grep 'cosmos_sdk_version: v0.47'; then GENESIS="genesis" ADD_INIT_FLAGS="--default-denom=${DENOM}" else diff --git a/devnets/env/terra.env b/devnets/env/terra.env index bcbe19b..f5570ab 100644 --- a/devnets/env/terra.env +++ b/devnets/env/terra.env @@ -1,5 +1,5 @@ COMPOSE_PROJECT_NAME=terra -VERSION=2.5.0-rc5 +VERSION=2.4.1 APP_NAME=terra BIN_NAME=terrad USER_NAME=terra