Skip to content

Commit 2f69983

Browse files
faddatfaddat
authored
Merge pull request CosmosContracts#543 from CosmosContracts/reece/bump-to-v13
chore(cleanup): Main to V13 + ICA improvement
2 parents d3a183a + f77aa31 commit 2f69983

File tree

137 files changed

+741
-794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+741
-794
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup go
1616
uses: actions/setup-go@v3
1717
with:
18-
go-version: 1.19
18+
go-version: 1.20.0
1919
- run: go build ./...
2020

2121
test:
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Go
2626
uses: actions/setup-go@v3
2727
with:
28-
go-version: 1.19
28+
go-version: 1.20.0
2929
- name: Checkout code
3030
uses: actions/checkout@v3
3131
- name: Test
@@ -37,10 +37,9 @@ jobs:
3737
- uses: actions/checkout@v3
3838
- uses: actions/setup-go@v3
3939
with:
40-
go-version: 1.19
40+
go-version: 1.20.0
4141
- name: Test price-feeder
42-
run: cd price-feeder && make test-unit
43-
42+
run: cd price-feeder && make test-unit
4443

4544
tidy:
4645
runs-on: ubuntu-latest
@@ -50,7 +49,7 @@ jobs:
5049
- name: Setup go
5150
uses: actions/setup-go@v3
5251
with:
53-
go-version: 1.19
52+
go-version: 1.20.0
5453
- run: |
5554
go mod tidy
5655
CHANGES_IN_REPO=$(git status --porcelain)

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@v3
3232
- uses: actions/setup-go@v3
3333
with:
34-
go-version: 1.19
34+
go-version: 1.20.0
3535
# Initializes the CodeQL tools for scanning.
3636
- name: Initialize CodeQL
3737
uses: github/codeql-action/init@v2
@@ -50,7 +50,6 @@ jobs:
5050
# with:
5151
# debug: true
5252

53-
5453
# ℹ️ Command-line programs to run using the OS shell.
5554
# 📚 https://git.io/JvXDl
5655

‎.github/workflows/golangci-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/setup-go@v3
2626
with:
27-
go-version: 1.19
27+
go-version: 1.20.0
2828
- uses: actions/checkout@v3
2929

3030
- name: golangci-lint-junod
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: golangci-lint-price_feeder
3737
uses: golangci/golangci-lint-action@v3
38-
with:
38+
with:
3939
version: latest
4040
working-directory: price-feeder
4141
args: --timeout 10m

‎.github/workflows/lint-price-feeder.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
name: golangci-lint
3+
on:
4+
push:
5+
tags:
6+
- v*
7+
branches:
8+
- master
9+
- main
10+
pull_request:
11+
permissions:
12+
contents: read
13+
# Optional: allow read access to pull request. Use with `only-new-issues` option.
14+
# pull-requests: read
15+
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.ref }}
18+
cancel-in-progress: true
19+
20+
jobs:
21+
golangci:
22+
name: lint
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/setup-go@v3
26+
with:
27+
go-version: 1.20.0
28+
- uses: actions/checkout@v3
29+
30+
- name: golangci-lint-price_feeder
31+
uses: golangci/golangci-lint-action@v3
32+
with:
33+
version: latest
34+
working-directory: price-feeder
35+
args: --timeout 10m

‎.github/workflows/price-feeder-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fetch-depth: 0
1717
- uses: actions/setup-go@v3
1818
with:
19-
go-version: 1.18
19+
go-version: 1.20.0
2020
cache: true
2121
cache-dependency-path: price-feeder/go.sum
2222
# Parse 'v*.*.*' semantic version from 'price-feeder/v*.*.*' and save to

‎.github/workflows/test-e2e-oracle.yml‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,20 @@ jobs:
1919
runs-on: ubuntu-latest
2020
timeout-minutes: 25
2121
steps:
22-
-
23-
name: Setup Go
22+
- name: Setup Go
2423
uses: actions/[email protected]
2524
with:
26-
go-version: 1.19
27-
-
28-
name: Check out repository code
25+
go-version: 1.20.0
26+
- name: Check out repository code
2927
uses: actions/checkout@v2
30-
-
31-
name: Get git diff
28+
- name: Get git diff
3229
uses: technote-space/[email protected]
3330
with:
3431
PATTERNS: |
3532
**/**.go
3633
go.mod
3734
go.sum
38-
-
39-
name: Get data from build cache
35+
- name: Get data from build cache
4036
uses: actions/cache@v3
4137
with:
4238
# In order:
@@ -52,15 +48,11 @@ jobs:
5248
key: ${{ runner.os }}-go-docker-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
5349
restore-keys: |
5450
${{ runner.os }}-go-docker-${{ matrix.go-version }}-
55-
-
56-
name: Set up QEMU
51+
- name: Set up QEMU
5752
uses: docker/setup-qemu-action@v2
58-
-
59-
name: Set up Docker Buildx
53+
- name: Set up Docker Buildx
6054
uses: docker/setup-buildx-action@v2
61-
-
62-
name: Build e2e image
55+
- name: Build e2e image
6356
run: make docker-build-debug
64-
-
65-
name: Test e2e oracle
66-
run: make test-e2e-oracle
57+
- name: Test e2e oracle
58+
run: make test-e2e-oracle

‎.github/workflows/test-e2e.yml‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test-e2e
1+
name: Test-e2e
22

33
on:
44
pull_request:
@@ -19,24 +19,20 @@ jobs:
1919
runs-on: ubuntu-latest
2020
timeout-minutes: 25
2121
steps:
22-
-
23-
name: Setup Go
22+
- name: Setup Go
2423
uses: actions/[email protected]
2524
with:
26-
go-version: 1.18
27-
-
28-
name: Check out repository code
25+
go-version: 1.20.0
26+
- name: Check out repository code
2927
uses: actions/checkout@v2
30-
-
31-
name: Get git diff
28+
- name: Get git diff
3229
uses: technote-space/[email protected]
3330
with:
3431
PATTERNS: |
3532
**/**.go
3633
go.mod
3734
go.sum
38-
-
39-
name: Get data from build cache
35+
- name: Get data from build cache
4036
uses: actions/cache@v3
4137
with:
4238
# In order:
@@ -52,15 +48,11 @@ jobs:
5248
key: ${{ runner.os }}-go-docker-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
5349
restore-keys: |
5450
${{ runner.os }}-go-docker-${{ matrix.go-version }}-
55-
-
56-
name: Set up QEMU
51+
- name: Set up QEMU
5752
uses: docker/setup-qemu-action@v2
58-
-
59-
name: Set up Docker Buildx
53+
- name: Set up Docker Buildx
6054
uses: docker/setup-buildx-action@v2
61-
-
62-
name: Build e2e image
55+
- name: Build e2e image
6356
run: make docker-build-debug
64-
-
65-
name: Test e2e and Upgrade
57+
- name: Test e2e and Upgrade
6658
run: make test-e2e-ci

‎.github/workflows/test-simulation.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
on: pull_request
3-
name: Test Simulation
2+
on: pull_request
3+
name: Test Simulation
44

55
concurrency:
66
group: ${{ github.workflow }}-${{ github.ref }}
@@ -11,11 +11,11 @@ jobs:
1111
runs-on: ubuntu-latest
1212
name: test
1313
steps:
14-
- name: Install Go
15-
uses: actions/setup-go@v3
16-
with:
17-
go-version: 1.18
18-
- name: Checkout code
19-
uses: actions/checkout@v3
20-
- name: Test
21-
run: make test-sim-multi-seed-short
14+
- name: Install Go
15+
uses: actions/setup-go@v3
16+
with:
17+
go-version: 1.20.0
18+
- name: Checkout code
19+
uses: actions/checkout@v3
20+
- name: Test
21+
run: make test-sim-multi-seed-short

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# docker build . -t cosmoscontracts/juno:latest
22
# docker run --rm -it cosmoscontracts/juno:latest /bin/sh
3-
FROM golang:1.19-alpine AS go-builder
3+
FROM golang:1.20-alpine AS go-builder
44

55
# this comes from standard alpine nightly file
66
# https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile

‎Makefile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ TM_VERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::
2121
DOCKER := $(shell which docker)
2222
DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8
2323
BUILDDIR ?= $(CURDIR)/build
24-
E2E_UPGRADE_VERSION := "v12"
24+
E2E_UPGRADE_VERSION := "v13"
2525
export GO111MODULE = on
2626

2727
# process build tags
@@ -92,6 +92,14 @@ endif
9292
include contrib/devtools/Makefile
9393

9494
all: install
95+
@echo "--> project root: go mod tidy"
96+
@go mod tidy
97+
@echo "--> price-feeder: go mod tidy "
98+
@make -C price-feeder tidy
99+
@echo "--> price-feeder: linting --fix"
100+
@make -C price-feeder lint
101+
@echo "--> project root: linting --fix"
102+
@GOGC=1 golangci-lint run --fix --timeout=8m
95103

96104
install: go.sum
97105
go install -mod=readonly $(BUILD_FLAGS) ./cmd/junod

0 commit comments

Comments
 (0)