Skip to content

Commit

Permalink
remove cache e2e (#7098) (#7105)
Browse files Browse the repository at this point in the history
(cherry picked from commit bd156c7)

Co-authored-by: Adam Tucker <[email protected]>
  • Loading branch information
mergify[bot] and czarcas7ic authored Dec 13, 2023
1 parent 6acdf45 commit dd8063a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/e2e-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,9 @@ jobs:
load: true
context: .
tags: osmosis:debug
# Use experimental Cache backend API:
# https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#cache-backend-api
cache-from: type=gha
cache-to: type=gha,mode=max
build-args: |
BASE_IMG_TAG=debug
BUILD_TAGS="netgo,ledger,muslc,excludeIncrement"
BUILD_TAGS="netgo,muslc,excludeIncrement"
- name: Test e2e and Upgrade
run: make test-e2e-ci-scheduled
- name: Dump docker logs on failure
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,9 @@ jobs:
load: true
context: .
tags: osmosis:debug
# Use experimental Cache backend API:
# https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#cache-backend-api
cache-from: type=gha
cache-to: type=gha,mode=max
build-args: |
BASE_IMG_TAG=debug
BUILD_TAGS="netgo,ledger,muslc,excludeIncrement"
BUILD_TAGS="netgo,muslc,excludeIncrement"
- name: Test e2e and Upgrade
run: make test-e2e-ci
- name: Dump docker logs on failure
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
-X github.com/cosmos/cosmos-sdk/version.AppName="osmosisd" \
-X github.com/cosmos/cosmos-sdk/version.Version=${GIT_VERSION} \
-X github.com/cosmos/cosmos-sdk/version.Commit=${GIT_COMMIT} \
-X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,muslc \
-X github.com/cosmos/cosmos-sdk/version.BuildTags=${BUILD_TAGS} \
-w -s -linkmode=external -extldflags '-Wl,-z,muldefs -static'" \
-trimpath \
-o /osmosis/build/osmosisd \
Expand Down
2 changes: 1 addition & 1 deletion scripts/makefiles/e2e.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ e2e-build-script:
go build -mod=readonly $(BUILD_FLAGS) -o $(BUILDDIR)/ ./tests/e2e/initialization/$(E2E_SCRIPT_NAME)

e2e-docker-build-debug:
@DOCKER_BUILDKIT=1 docker build --build-arg BUILD_TAGS="netgo,ledger,muslc,excludeIncrement" -t osmosis:${COMMIT} --build-arg BASE_IMG_TAG=debug --build-arg RUNNER_IMAGE=$(RUNNER_BASE_IMAGE_ALPINE) -f Dockerfile .
@DOCKER_BUILDKIT=1 docker build --build-arg BUILD_TAGS="netgo,muslc,excludeIncrement" -t osmosis:${COMMIT} --build-arg BASE_IMG_TAG=debug --build-arg RUNNER_IMAGE=$(RUNNER_BASE_IMAGE_ALPINE) -f Dockerfile .
@DOCKER_BUILDKIT=1 docker tag osmosis:${COMMIT} osmosis:debug

e2e-docker-build-e2e-init-chain:
Expand Down

0 comments on commit dd8063a

Please sign in to comment.