Skip to content

Commit

Permalink
Update make version (#646)
Browse files Browse the repository at this point in the history
* Update simnode script

* Add new bootnode peer ID
  • Loading branch information
haroldsphinx authored Feb 17, 2022
1 parent 47e5f76 commit cc20db2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: "Docker Release"

on:
workflow_dispatch:
push:
push:
branches:
- update-make-version
tags:
- '*'

Expand Down Expand Up @@ -37,7 +39,7 @@ jobs:

- name: Set env
run: |
echo "RELEASE_VERSION=$(git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1 | cut -c2- )" >> $GITHUB_ENV
echo "RELEASE_VERSION=$(git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1)" >> $GITHUB_ENV
make version
- name: Build Composable Artifacts
Expand Down
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ REPO=composablefi
SERVICE_NAME=composable
INSTALL_DIR=docker/
IMAGE_URL:=${REPO}/${SERVICE_NAME}
CARGO_VERSION:=$(shell git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1 )
AUTO_UPDATE:=1


Expand Down Expand Up @@ -50,7 +49,7 @@ dev:
.PHONY: version
version:
@if [ ${RELEASE_VERSION} ]; then \
sed -i "s|^version =.*|version = '"${RELEASE_VERSION}"'|" node/Cargo.toml; \
sed -i "s|^version =.*|version = '"${RELEASE_VERSION}"'|" Cargo.toml; \
fi;


Expand All @@ -59,7 +58,7 @@ containerize-release: version containerize

containerize:
@docker build \
--build-arg SERVICE_DIR=${INSTALL_DIR} --build-arg VERSION=${CARGO_VERSION} \
--build-arg SERVICE_DIR=${INSTALL_DIR} --build-arg VERSION=${RELEASE_VERSION} \
-f ${INSTALL_DIR}/Dockerfile \
-t ${IMAGE_WITH_COMMIT} \
-t ${IMAGE_WITH_RELEASE_VERSION} \
Expand Down Expand Up @@ -113,4 +112,4 @@ define print_help_text
make stop : Stop all current running containers
make push : Push all built images to the specified docker registry
"
endef
endef
4 changes: 2 additions & 2 deletions node/src/res/dali-rococo.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"chainType": "Live",
"bootNodes": [
"/dns/bn1.composablefinance.ninja/tcp/30334/p2p/12D3KooWNTHjzEd5WRYAKzavt2fnBf2e7xoYD9UJtiByFxHAykce",
"/dns/bn1.composablefinance.ninja/tcp/30334/p2p/12D3KooWAaVe7Gi4AcczXNUgVZzL5N3cLx9gbDLyKbjVYdAu6N4J",
"/dns/bn1.composablefinance.ninja/tcp/30334/p2p/12D3KooWS64zXbFEeRaEt1Kag9rmirEgK3cZ8bE91JQv5FxFRBVn"
"/dns/bn2.composablefinance.ninja/tcp/30334/p2p/12D3KooWAaVe7Gi4AcczXNUgVZzL5N3cLx9gbDLyKbjVYdAu6N4J",
"/dns/bn3.composablefinance.ninja/tcp/30334/p2p/12D3KooWS64zXbFEeRaEt1Kag9rmirEgK3cZ8bE91JQv5FxFRBVn"
],
"telemetryEndpoints": [
[
Expand Down

0 comments on commit cc20db2

Please sign in to comment.