Skip to content

Commit

Permalink
rever terra to 2.4, fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
gregnuj committed Sep 27, 2023
1 parent 8894a82 commit d1a0c96
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 90 deletions.
170 changes: 85 additions & 85 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion arch.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion builds/terra.2.4.1.alpine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion builds/terra.2.4.1.arch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion devnets/bin/init-chain
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion devnets/env/terra.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit d1a0c96

Please sign in to comment.