Skip to content

Commit

Permalink
Merge pull request #4437 from harmony-one/dev
Browse files Browse the repository at this point in the history
Release Candidate v2023.2.2
  • Loading branch information
ONECasey committed Jun 23, 2023
2 parents 6577b0b + 32e5913 commit 3d8d455
Show file tree
Hide file tree
Showing 102 changed files with 1,282 additions and 766 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/build-docker-proto-image.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Build and Push harmony proto Docker Image

on:
workflow_dispatch:

jobs:
build_and_push:
runs-on: ubuntu-latest

steps:
- name: Checkout harmony core code
uses: actions/checkout@v3
with:
path: harmony
ref: ${{ github.ref }}
fetch-depth: 0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v3
with:
context: ./harmony/api/service/legacysync/downloader
file: ./harmony/api/service/legacysync/downloader/Proto.Dockerfile
push: true
platforms: linux/amd64,linux/arm64
tags: |
harmonyone/harmony-proto:latest
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
os: linux
dist: bionic
dist: jammy
language: go
go:
- 1.19.5
Expand All @@ -22,13 +22,10 @@ install:
- git clone https://github.com/harmony-one/harmony-test.git $GOPATH/src/github.com/harmony-one/harmony-test
- (cd $GOPATH/src/github.com/harmony-one/mcl; make -j4)
- (cd $GOPATH/src/github.com/harmony-one/bls; make BLS_SWAP_G=1 -j4)
- go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26
- go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1
# - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.41.1
- make go-get
- go install golang.org/x/tools/cmd/goimports@latest
- go install github.com/harmony-ek/gencodec@latest
- scripts/install_build_tools.sh
script:
- ${TEST}
after_success:
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,6 @@ go-test:

docker:
docker build --pull -t harmonyone/$(PKGNAME):latest -f scripts/docker/Dockerfile .

travis_go_checker:
bash ./scripts/travis_go_checker.sh
4 changes: 3 additions & 1 deletion api/proto/message/gen.sh
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
protoc -I ./ message.proto --go_out=. --go-grpc_out=.
#!/bin/bash

docker run --platform linux/amd64 -v ${PWD}:/tmp ${PROTOC_IMAGE} /tmp/message.proto
2 changes: 1 addition & 1 deletion api/proto/message/message.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package message

//go:generate protoc message.proto --go_out=. --go-grpc_out=.
//go:generate ./gen.sh
82 changes: 41 additions & 41 deletions api/proto/message/message.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3d8d455

Please sign in to comment.