Skip to content

Commit

Permalink
Merge pull request #306 from nspcc-dev/update-versions
Browse files Browse the repository at this point in the history
Update versions
  • Loading branch information
roman-khimov committed Feb 27, 2024
2 parents 95acc4b + 2053014 commit c5b916e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 18 deletions.
12 changes: 6 additions & 6 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ NEO_GO_PLATFORM=linux-amd64
NEO_GO_URL=https://github.com/nspcc-dev/neo-go/releases/download/v${NEOGO_VERSION}/neo-go-${NEO_GO_PLATFORM}

# NeoFS InnerRing nodes
IR_VERSION=0.39.1
IR_VERSION=0.40.1
IR_IMAGE=nspccdev/neofs-ir

# NeoFS Storage nodes
NODE_VERSION=0.39.1
NODE_VERSION=0.40.1
NODE_IMAGE=nspccdev/neofs-storage

# NATS Server
NATS_VERSION=2.7.2
NATS_IMAGE=nats

# HTTP Gate
HTTP_GW_VERSION=0.27.5
HTTP_GW_VERSION=0.28.0
HTTP_GW_IMAGE=nspccdev/neofs-http-gw

# REST Gate
Expand All @@ -45,12 +45,12 @@ COREDNS_VERSION=v016
COREDNS_IMAGE=nspccdev/coredns

# NeoFS CLI binary
NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.39.1/neofs-cli-amd64.tar.gz
NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.40.1/neofs-cli-linux-amd64
#NEOFS_CLI_PATH=/path/to/neofs-cli-binary

# NeoFS ADM tool binary
NEOFS_ADM_VERSION=v0.39.1
NEOFS_ADM_URL=https://github.com/nspcc-dev/neofs-node/releases/download/${NEOFS_ADM_VERSION}/neofs-adm-amd64.tar.gz
NEOFS_ADM_VERSION=v0.40.1
NEOFS_ADM_URL=https://github.com/nspcc-dev/neofs-node/releases/download/${NEOFS_ADM_VERSION}/neofs-adm-linux-amd64
#NEOFS_ADM_PATH=/path/to/neofs-adm-binary

# Compiled NeoFS Smart Contracts
Expand Down
16 changes: 4 additions & 12 deletions services/ir/artifacts.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,15 @@ get.ir: get.cli get.contracts get.adm get.storage prepare.storage
# Download NeoFS CLI
.ONESHELL:
get.cli: NEOFS_CLI_FILE=./vendor/neofs-cli
get.cli: NEOFS_CLI_ARCHIVE_FILE=${NEOFS_CLI_FILE}.tar.gz
get.cli: NEOFS_CLI_PATH?=
get.cli:
@touch services/ir/.ir.env # https://github.com/docker/compose/issues/3560
@mkdir -p ./vendor

ifeq (${NEOFS_CLI_PATH},)
@echo "⇒ Download NeoFS CLI binary from ${NEOFS_CLI_URL}"
@curl \
-sSL "${NEOFS_CLI_URL}" \
-o ${NEOFS_CLI_ARCHIVE_FILE}
@tar -xvf ${NEOFS_CLI_ARCHIVE_FILE} -C ./vendor | xargs -I {} \
mv ./vendor/{} ${NEOFS_CLI_FILE}
@rm ${NEOFS_CLI_ARCHIVE_FILE}
@curl -sSL "${NEOFS_CLI_URL}" -o ${NEOFS_CLI_FILE}
@chmod 755 ${NEOFS_CLI_FILE}
else
@echo "⇒ Copy local binary from ${NEOFS_CLI_PATH}"
@cp ${NEOFS_CLI_PATH} ${NEOFS_CLI_FILE}
Expand All @@ -43,15 +38,12 @@ endif

# Download NeoFS ADM tool
get.adm: NEOFS_ADM_DEST=./vendor/neofs-adm
get.adm: NEOFS_ADM_ARCHIVE=neofs-adm.tar.gz
get.adm:

ifeq (${NEOFS_ADM_PATH},)
@echo "⇒ Download NeoFS ADM binary from ${NEOFS_ADM_URL}"
@curl -sSL ${NEOFS_ADM_URL} -o ${NEOFS_ADM_ARCHIVE}
@tar -xvf ${NEOFS_ADM_ARCHIVE} -C ./vendor | xargs -I {} \
mv ./vendor/{} ${NEOFS_ADM_DEST}
@rm ${NEOFS_ADM_ARCHIVE}
@curl -sSL ${NEOFS_ADM_URL} -o ${NEOFS_ADM_DEST}
@chmod 755 ${NEOFS_ADM_DEST}
else
@echo "⇒ Copy neofs-adm binary from ${NEOFS_ADM_PATH}"
@cp ${NEOFS_ADM_PATH} ${NEOFS_ADM_DEST}
Expand Down

0 comments on commit c5b916e

Please sign in to comment.