Skip to content

Commit

Permalink
Merge branch 'master' into chains/mainnet
Browse files Browse the repository at this point in the history
  • Loading branch information
olegfomenko committed Dec 2, 2024
2 parents 96e34a3 + 26fab4e commit 9d23251
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 61 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@ on:

jobs:
converge:
name: Converge
runs-on: ubuntu-latest
name: Skaffold Build Manual
runs-on: ubuntu-22.04
steps:

- name: Checkout code
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Install werf
uses: werf/actions/[email protected]

- name: Log in to registry
# This is where you will update the personal access token to GITHUB_TOKEN
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin

- name: Run echo
run: |
werf version
docker version
echo $GITHUB_REPOSITORY
echo $GITHUB_SHA
- name: Run Build
run: |
. $(werf ci-env github --as-file)
werf export service --tag ghcr.io/$GITHUB_REPOSITORY:$GITHUB_SHA
- name: Cache layers
uses: actions/cache@v3
with:
path: "${{ github.workspace }}/.skaffold/cache"
key: skaffold-${{ hashFiles('**/cache') }}
restore-keys: |
skaffold-
- name: Run Skaffold pipeline as command
uses: hiberbee/github-action-skaffold@latest
id: build
with:
command: build --tag ${{ github.sha }}
repository: ghcr.io/${{ github.repository_owner }}
32 changes: 16 additions & 16 deletions .github/workflows/actions_onlymain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@ on:

jobs:
converge:
name: Converge
runs-on: ubuntu-latest
name: Skaffold Build Only Main
runs-on: ubuntu-22.04
steps:

- name: Checkout code
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Install werf
uses: werf/actions/[email protected]

- name: Log in to registry
# This is where you will update the personal access token to GITHUB_TOKEN
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin

- name: Run echo
run: |
werf version
docker version
echo $GITHUB_REPOSITORY
echo $GITHUB_SHA
- name: Run Build
run: |
. $(werf ci-env github --as-file)
werf export service --tag ghcr.io/$GITHUB_REPOSITORY:$GITHUB_SHA
- name: Cache layers
uses: actions/cache@v3
with:
path: "${{ github.workspace }}/.skaffold/cache"
key: skaffold-${{ hashFiles('**/cache') }}
restore-keys: |
skaffold-
- name: Run Skaffold pipeline as command
uses: hiberbee/github-action-skaffold@latest
id: build
with:
command: build --tag ${{ github.sha }}
repository: ghcr.io/${{ github.repository_owner }}
32 changes: 16 additions & 16 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@ on:

jobs:
converge:
name: Converge
runs-on: ubuntu-latest
name: Skaffold Build For Tag
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Install werf
uses: werf/actions/[email protected]

- name: Log in to registry
# This is where you will update the personal access token to GITHUB_TOKEN
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin

- name: Run echo
run: |
werf version
docker version
echo $GITHUB_REPOSITORY
echo $GITHUB_REF_NAME
- name: Run Build
run: |
. $(werf ci-env github --as-file)
werf export service --tag ghcr.io/$GITHUB_REPOSITORY:$GITHUB_REF_NAME
- name: Cache layers
uses: actions/cache@v3
with:
path: "${{ github.workspace }}/.skaffold/cache"
key: skaffold-${{ hashFiles('**/cache') }}
restore-keys: |
skaffold-
- name: Run Skaffold pipeline as command
uses: hiberbee/github-action-skaffold@latest
id: build
with:
command: build --tag ${{ github.sha }}
repository: ghcr.io/${{ github.repository_owner }}

- uses: shrink/actions-docker-extract@v3
id: extract
Expand Down
File renamed without changes.
17 changes: 5 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,30 @@ FROM golang:1.20-alpine as buildbase

RUN apk add build-base git

ARG CI_JOB_TOKEN

WORKDIR /go/src/github.com/rarimo/rarimo-core

ENV GO111MODULE="on"
ENV CGO_ENABLED=1
ENV GOOS="linux"
ENV GOPRIVATE=gitlab.com/*
ENV GONOSUMDB=gitlab.com/*
ENV GONOPROXY=gitlab.com/*

RUN echo "machine gitlab.com login gitlab-ci-token password $CI_JOB_TOKEN" > ~/.netrc
# RUN git config --global url."https://gitlab-ci-token:[email protected]/".insteadOf https://gitlab.com/
COPY go.mod .
COPY go.sum .
RUN go mod download

COPY . .

RUN go mod vendor
# TODO switch to latest cosmosvisor
RUN go install cosmossdk.io/tools/cosmovisor/cmd/[email protected]

RUN go build -o /usr/local/bin/rarimo-core github.com/rarimo/rarimo-core/cmd/rarimo-cored



###
RUN cp $GOPATH/bin/cosmovisor /usr/local/bin/cosmovisor
RUN go build -mod=mod -o /usr/local/bin/rarimo-core github.com/rarimo/rarimo-core/cmd/rarimo-cored

FROM alpine:3.9

RUN apk add --no-cache ca-certificates

COPY --from=buildbase /usr/local/bin/rarimo-core /usr/local/bin/rarimo-core
COPY --from=buildbase /usr/local/bin/cosmovisor /usr/local/bin/cosmovisor

ENTRYPOINT ["rarimo-core"]
16 changes: 16 additions & 0 deletions docs/common/mainnet/002-upgrades.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,22 @@ title: Mainnet upgrades

# Mainnet upgrades

## V1.1.4
Core binary: (aplina-linux/amd64): "<https://github.com/rarimo/rarimo-core/releases/download/v1.1.4/rarimo-core-alpine-linux-amd64>".

Also, you can build core from sources by yourself: use "<https://github.com/rarimo/rarimo-core/releases/tag/v1.1.4>"
release information.

Also, if you are using Ubuntu linux, please install `musl-dev` using `sudo apt install musl-dev` command to be able to
use Alpine binary on your machine.

If you are using `cosmovisor` the upgrade will be done automatically.

### What's new?

Upgrade v1.1.4 introduces the new Rootupdater module. This module is designed to extract the passport root from Ethereum Virtual Machine (EVM) contract events and
subsequently create a new operation for `rarimo-core` module. To learn more, refer to the documentation for the [rootupdater](../../../x/rootupdater) module

## V1.1.3

Core binary: (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -222,4 +222,4 @@ replace (
github.com/tendermint/tendermint => github.com/tendermint/tendermint v0.34.24
google.golang.org/grpc => google.golang.org/grpc v1.55.0
nhooyr.io/websocket => github.com/coder/websocket v1.8.6
)
)
5 changes: 5 additions & 0 deletions skaffold.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: skaffold/v2beta28
kind: Config
build:
artifacts:
- image: rarimo-core

0 comments on commit 9d23251

Please sign in to comment.