Skip to content

Commit

Permalink
feat/keep tests in separate repo for upgrade to 1.22 (#4736)
Browse files Browse the repository at this point in the history
* Test.
* 1.21.11
* Fixed rosetta
* Fixed bootstrap
* Custom genesis generation for [email protected]+.
* Fixed 1.19 imports.
* Fixed 1.19 imports.
* Replaced 1.20 keys.
* 100% coverage.
* Fixed trailing zeroes.
* Rebased & Fixed protobuf usage.
* Compatibility with [email protected].
* Regenerated proto files to the latest version.
* Disabled transport security.
* [email protected]
* fix: add fetch to the the travis scripts
* fix: point travis to the 1.22 golang tests
* set p2p NoTransportSecurity default to false
* feat(go version) - bump go version in Dockerfiles and README.md
* Go 1.22 tags.
---------

Co-authored-by: frozen <[email protected]>
Co-authored-by: Nita Neou (Soph) <[email protected]>
  • Loading branch information
3 people authored Aug 26, 2024
1 parent 5ec19bc commit c44c2ea
Show file tree
Hide file tree
Showing 30 changed files with 732 additions and 540 deletions.
17 changes: 15 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,15 @@
*
!scripts/docker
harmony_db*
bin
cache
.DS_Store
*.log
log-*
tmp_log
*.rlp
**/*.rlp
.hmykey
db-127.0.0.1-*
db*
.dht
.dht-*
explorer_storage_*
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ os: linux
dist: jammy
language: go
go:
- 1.19.5
- 1.22.5
go_import_path: github.com/harmony-one/harmony
cache:
directories:
Expand All @@ -24,9 +24,11 @@ install:
# /home/travis/gopath/src/github.com/harmony-one/harmony
# https://docs.travis-ci.com/user/languages/go/#go-import-path
- echo $TRAVIS_PULL_REQUEST_BRANCH
- TEST_REPO_BRANCH="master"
#TODO: return back to master
- TEST_REPO_BRANCH="feature/go1.22"
- git clone https:/harmony-one/mcl.git $GOPATH/src/github.com/harmony-one/mcl
- git clone https:/harmony-one/bls.git $GOPATH/src/github.com/harmony-one/bls
#TODO: return back harmony instead of personal fork
- git clone --branch $TEST_REPO_BRANCH https:/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)
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:18.04
FROM ubuntu:22.04

ARG TARGETARCH
ARG GOLANG_VERSION="1.19"
ARG GOLANG_VERSION="1.22.5"

SHELL ["/bin/bash", "-c"]

Expand Down
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ trace-pointer:

debug:
rm -rf .dht-127.0.0.1*
# uncomment the following lines to enable debug logging for libp2p, it produces a lot of logs, so disabled by default
#export GOLOG_LOG_LEVEL=debug
#export GOLOG_OUTPUT=stdout
bash ./test/debug.sh

debug-kill:
Expand Down Expand Up @@ -200,3 +203,6 @@ debug_external: clean

build_localnet_validator:
bash test/build-localnet-validator.sh

protofiles:
bash ./scripts/gogenerate.sh
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ http://api.hmny.io/

## Requirements

### **Go 1.19**
### **Go 1.22.5**
### **GMP and OpenSSL**

On macOS:
Expand Down
2 changes: 1 addition & 1 deletion api/proto/message/client.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package message
package harmonymessage

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion api/proto/message/gen.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

docker run --platform linux/amd64 -v ${PWD}:/tmp ${PROTOC_IMAGE} /tmp/message.proto
docker run --platform linux/amd64 -v ${PWD}:/tmp ${PROTOC_IMAGE} /tmp/harmonymessage.proto
Loading

0 comments on commit c44c2ea

Please sign in to comment.