remove cache e2e (#7098)

osmosis-labs · Dec 13, 2023 · bd156c7 · bd156c7
1 parent 44dfe02
commit bd156c7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/e2e-full.yml b/.github/workflows/e2e-full.yml
@@ -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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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

diff --git a/Dockerfile b/Dockerfile
@@ -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 \

diff --git a/scripts/makefiles/e2e.mk b/scripts/makefiles/e2e.mk
@@ -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: