Skip to content

Commit

Permalink
v6 upgrade (#207)
Browse files Browse the repository at this point in the history
* v5 -> v6

* move to github runners, go to 1.19, mod tidy

* cosmos-sdk 0.45.13, ibc-go 3.4.0

* fix proto go packages to v6

* v6 upgrade

* Update linter for go 1.19

* Appease linter

* sdk down to 0.45.10, tendermint to 0.34.22

put back dragonberry replace directive after sdk downgrade to match
gravity

* golang back down to 1.18

* Update v6 upgrade README
  • Loading branch information
EricBolten authored Apr 25, 2023
1 parent 7e2062d commit 1b659af
Show file tree
Hide file tree
Showing 74 changed files with 766 additions and 669 deletions.
24 changes: 16 additions & 8 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ jobs:
permissions:
contents: read
packages: write
runs-on: [self-hosted, linux]
runs-on: ubuntu-20.04
steps:
- name: Set up Go 1.18
uses: actions/setup-go@v2
with:
go-version: 1.18
- name: checkout
uses: actions/checkout@v2
- name: Set up Docker Buildx
Expand Down Expand Up @@ -64,7 +68,7 @@ jobs:
permissions:
contents: write
packages: write
runs-on: [self-hosted, linux]
runs-on: ubuntu-20.04
steps:
- name: checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -108,7 +112,7 @@ jobs:
integration-tests:
environment: CI
runs-on: [self-hosted, linux]
runs-on: ubuntu-20.04
needs: [ sommelier-build, hardhat-build ]
strategy:
fail-fast: false
Expand All @@ -119,11 +123,10 @@ jobs:
"Incentives",
]
steps:
# Not needed on self hosted test runner that already has go installed
# - name: Set up Go 1.16
# uses: actions/setup-go@v2
# with:
# go-version: ^1.16
- name: Set up Go 1.18
uses: actions/setup-go@v2
with:
go-version: 1.18
- name: checkout
uses: actions/checkout@v2
- name: go-cache
Expand Down Expand Up @@ -170,4 +173,9 @@ jobs:
- name: Run end to end test
run: ./integration_tests/integration_tests.test -test.failfast -test.v -test.run IntegrationTestSuite -testify.m Test${{ matrix.test_type }}
env:
E2E_SKIP_CLEANUP: true
ARCHIVE_NODE_URL: ${{ secrets.ARCHIVE_NODE_URL }}
- name: Clean up docker images
run: ./clean_slate.sh
- name: Remove testnet tempdir
run: sudo rm -rf somm-e2e-testnet*
9 changes: 4 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:
jobs:
golangci:
name: golangci-lint
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
timeout-minutes: 6
steps:
- uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: 1.16
go-version: 1.18
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
with:
Expand All @@ -26,8 +26,7 @@ jobs:
- uses: golangci/golangci-lint-action@v3
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.37
skip-go-installation: true
version: v1.47
args: --timeout 10m
github-token: ${{ secrets.github_token }}
if: env.GIT_DIFF
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- uses: actions/setup-go@v2
with:
go-version: '1.16'
go-version: '1.18'

- run: echo ":rocket::rocket::rocket:" > ../release_notes.md
if: startsWith(github.ref, 'refs/tags/')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.16]
go-version: [1.18]
os: [ubuntu-latest]
runs-on: ubuntu-latest
steps:
Expand Down
19 changes: 2 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ tools-clean:
# Integration tests #
#####################

ORCHESTRATOR_IMAGE := "ghcr.io/peggyjv/gravity-bridge-orchestrator:main"
ORCHESTRATOR_IMAGE := "ghcr.io/peggyjv/gravity-bridge-orchestrator:latest"

e2e_build_images: e2e_clean_slate
@docker pull $(ORCHESTRATOR_IMAGE)
Expand All @@ -360,22 +360,7 @@ e2e_build_images: e2e_clean_slate
@docker build -t ethereum:prebuilt -f integration_tests/ethereum/Dockerfile integration_tests/ethereum/

e2e_clean_slate:
@docker rm --force \
$(shell docker ps -qa --filter="name=ethereum") \
$(shell docker ps -qa --filter="name=sommelier") \
$(shell docker ps -qa --filter="name=orchestrator") \
1>/dev/null \
2>/dev/null \
|| true
@docker wait \
$(shell docker ps -qa --filter="name=ethereum") \
$(shell docker ps -qa --filter="name=sommelier") \
$(shell docker ps -qa --filter="name=orchestrator") \
1>/dev/null \
2>/dev/null \
|| true
@docker network prune --force 1>/dev/null 2>/dev/null || true
@cd integration_tests && go test -c
@./clean_slate.sh

e2e_basic: e2e_clean_slate
@integration_tests/integration_tests.test -test.run TestBasicChain -test.failfast -test.v || make -s fail
Expand Down
Loading

0 comments on commit 1b659af

Please sign in to comment.