Skip to content

Commit

Permalink
fix: e2e and remove toolchain (#8191)
Browse files Browse the repository at this point in the history
* remove toolchain

* remove exclude increment

* script

* remove build tags

* build script

* remove build arg

(cherry picked from commit 27548cc)

# Conflicts:
#	osmoutils/go.sum
#	x/ibc-hooks/go.sum
  • Loading branch information
czarcas7ic authored and mergify[bot] committed May 2, 2024
1 parent 24d9b92 commit 29a0917
Show file tree
Hide file tree
Showing 17 changed files with 104 additions and 239 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
tags: osmosis:debug
build-args: |
BASE_IMG_TAG=debug
BUILD_TAGS="netgo,muslc,excludeIncrement"
BUILD_TAGS="netgo,muslc"
- name: Test e2e and Upgrade
run: make test-e2e-ci-scheduled
- name: Dump docker logs on failure
Expand Down
81 changes: 27 additions & 54 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,13 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true


jobs:
get_diff:
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
-
name: Check out repository code
- name: Check out repository code
uses: actions/checkout@v4
-
name: Get git diff
- name: Get git diff
uses: technote-space/[email protected]
with:
PATTERNS: |
Expand All @@ -35,8 +32,7 @@ jobs:
Makefile
Dockerfile
.github/workflows/test.yml
-
name: Set output
- name: Set output
id: vars
run: echo "git_diff=$GIT_DIFF" >> $GITHUB_OUTPUT
outputs:
Expand All @@ -47,16 +43,13 @@ jobs:
if: ${{ needs.get_diff.outputs.git_diff || github.actor == 'dependabot[bot]' || github.actor == 'mergify[bot]' }}
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
-
name: Check out repository
- name: Check out repository
uses: actions/checkout@v4
-
name: 🐿 Setup Golang
- name: 🐿 Setup Golang
uses: actions/setup-go@v5
with:
go-version-file: go.mod
-
name: Create a file with all core Cosmos SDK pkgs
- name: Create a file with all core Cosmos SDK pkgs
run: |
go list \
./... \
Expand All @@ -66,27 +59,22 @@ jobs:
./x/epochs \
| grep -E -v 'tests/simulator|e2e' \
> pkgs.txt
-
name: Split pkgs into 4 files
- name: Split pkgs into 4 files
run: |
split -d -n l/4 pkgs.txt pkgs.txt.part.
-
uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v4
with:
name: "${{ github.sha }}-00"
path: ./pkgs.txt.part.00
-
uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v4
with:
name: "${{ github.sha }}-01"
path: ./pkgs.txt.part.01
-
uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v4
with:
name: "${{ github.sha }}-02"
path: ./pkgs.txt.part.02
-
uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v4
with:
name: "${{ github.sha }}-03"
path: ./pkgs.txt.part.03
Expand All @@ -100,23 +88,18 @@ jobs:
matrix:
part: ["00", "01", "02", "03"]
steps:
-
name: Check out repository
- name: Check out repository
uses: actions/checkout@v4
-
name: 🐿 Setup Golang
- name: 🐿 Setup Golang
uses: actions/setup-go@v5
with:
go-version-file: go.mod
-
name: Display go version
- name: Display go version
run: go version
-
uses: actions/download-artifact@v4
- uses: actions/download-artifact@v4
with:
name: "${{ github.sha }}-${{ matrix.part }}"
-
name: Test & coverage report creation
- name: Test & coverage report creation
run: |
VERSION=$(echo $(git describe --tags) | sed 's/^v//') || VERSION=${GITHUB_SHA}
TESTS=$(cat pkgs.txt.part.${{ matrix.part }})
Expand All @@ -128,55 +111,45 @@ jobs:
runs-on: buildjet-4vcpu-ubuntu-2204
timeout-minutes: 20
steps:
-
name: Check out repository
- name: Check out repository
uses: actions/checkout@v4
with:
fetch-depth: 0
-
name: Set up QEMU
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
-
name: Login to DockerHub
- name: Login to DockerHub
uses: docker/login-action@v3
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'mergify[bot]' }}
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: 🐿 Setup Golang
- name: 🐿 Setup Golang
uses: actions/setup-go@v5
with:
go-version-file: go.mod
-
name: Build e2e image
- name: Build e2e image
uses: docker/build-push-action@v5
with:
load: true
context: .
tags: osmosis:debug
build-args: |
BASE_IMG_TAG=debug
BUILD_TAGS="netgo,muslc,excludeIncrement"
-
name: Test e2e and Upgrade
BUILD_TAGS="netgo,muslc"
- name: Test e2e and Upgrade
run: make test-e2e-ci
-
name: Dump docker logs on failure
- name: Dump docker logs on failure
if: failure()
uses: jwalton/gh-docker-logs@v2
with:
dest: "./logs"
-
name: Tar logs
- name: Tar logs
if: failure()
run: |
tar cvzf ./logs.tgz ./logs
-
name: Upload logs to GitHub
- name: Upload logs to GitHub
if: failure()
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/root/go/pkg/mod \
GOWORK=off go build \
-mod=readonly \
-tags ${BUILD_TAGS} \
-tags "netgo,ledger,muslc" \
-ldflags \
"-X github.com/cosmos/cosmos-sdk/version.Name="osmosis" \
-X github.com/cosmos/cosmos-sdk/version.AppName="osmosisd" \
Expand Down
3 changes: 0 additions & 3 deletions app/ante.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//go:build !excludeIncrement
// +build !excludeIncrement

package app

import (
Expand Down
121 changes: 0 additions & 121 deletions app/ante_no_seq.go

This file was deleted.

10 changes: 4 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/osmosis-labs/osmosis/v25

go 1.21.4

toolchain go1.22.0

require (
cosmossdk.io/api v0.3.1
cosmossdk.io/errors v1.0.1
Expand All @@ -30,10 +28,10 @@ require (
github.com/mattn/go-sqlite3 v1.14.17
github.com/ory/dockertest/v3 v3.10.0
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3
github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662
github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430173456-105713b242f8
github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662
github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507
github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507
github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240502024814-785ee58ac507
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240502024814-785ee58ac507
github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea
github.com/pkg/errors v0.9.1
github.com/rakyll/statik v0.1.7
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1485,14 +1485,14 @@ github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/
github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k=
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 h1:YlmchqTmlwdWSmrRmXKR+PcU96ntOd8u10vTaTZdcNY=
github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3/go.mod h1:lV6KnqXYD/ayTe7310MHtM3I2q8Z6bBfMAi+bhwPYtI=
github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662 h1:P6deXtGtSXJgPtvo6f/1vAQgF38HUsrIT6Mq7LMGYrs=
github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662/go.mod h1:ubFhAjLis9cH6GPIhaCjf4JdXrn8HBBOxvOYMxPtgSM=
github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430173456-105713b242f8 h1:4Zm6E1mk8r68kwIUafaHbEWhexob60sxBTcVDlV7jek=
github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430173456-105713b242f8/go.mod h1:sHrm1JXicWHDt74cJavXKe19OWongf/kiVX9SBI+Dec=
github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662 h1:bG3Fll3ryw+yo+70u0oOUjxq1SZ2GgTRDgmivZEdPKE=
github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662/go.mod h1:3BTKszIZFP/3ut/sW0izJOZRNDXWINU5zfZGo+a8QhE=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662 h1:1GiW1IDHH6BfmBYdP5YGnS+TkO6ZKKVzSFccG9RH9gA=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662/go.mod h1:VBMzVCCaiVJokiQ+6+O6KAU9XaH656o6kCeHoVCiTL8=
github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507 h1:LJMTBQBH4Xiz9YzWo9BbxKvQr6Yij0e0z9Mb4X9kQKw=
github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240502024814-785ee58ac507/go.mod h1:iCRNyb2pkXwsr4UdbXJDX4lWkzeUNsIALzagBBTq4wU=
github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507 h1:wCCBw7gvrBQKuKAA+Oi0uLIlqTjSHi5uE0KinpT3wgU=
github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240502024814-785ee58ac507/go.mod h1:GaDargX3Hg/rthi993uk//ZH9K5+67589UM8h8TF6xY=
github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240502024814-785ee58ac507 h1:yrtrsYT6LwVHueT7Hbkoe58pxrVT8PPnm4QQqvhoAcE=
github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240502024814-785ee58ac507/go.mod h1:lfLwYLam75LnjFh0TLfM+TGyb8O4xLR4iAAVZKzi5KQ=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240502024814-785ee58ac507 h1:MQYr3x+tRmTM5a7BVfd68t4O453EMl4APhqmbFACPOs=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240502024814-785ee58ac507/go.mod h1:c9XhY9arUhqkVgSj4bw1P7NVUfdtwdeAHaDk2bYhVhY=
github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea h1:jcwN05LSSV7Vdp+FHp3WtabuFtBb7l+ki4O5R2P1Sr4=
github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea/go.mod h1:d3wAamev0J2ABDeUvCDTUnw0mMrraXRia1e/dqq/xFI=
github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8=
Expand Down
2 changes: 0 additions & 2 deletions go.work
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
go 1.21.4

toolchain go1.22.0

use .

use ./osmomath
Expand Down
Loading

0 comments on commit 29a0917

Please sign in to comment.