From e77977ecdb6b6b43e4dc1a35d8fa674924d04f1d Mon Sep 17 00:00:00 2001
From: mickamy <t.mikami1992@gmail.com>
Date: Thu, 4 Jan 2024 22:55:33 +0900
Subject: [PATCH] ci: give up on docker image caching

---
 .github/workflows/benchmark.yml | 8 --------
 Makefile                        | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index b2cfc693..62f000e8 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -32,15 +32,7 @@ jobs:
       - run: |
           sed -i 's/ishocon2-app-base/${{ env.UNAME }}\/ishocon2-app-base/g' ./docker-compose.yml
           cat ./docker-compose.yml
-      - run: make build-base build-bench
       - uses: docker/setup-buildx-action@v3
-      - uses: docker/build-push-action@v5.1.0
-        with:
-          context: .
-          file: ./docker/app/${{ env.ISHOCON_APP_LANG }}/Dockerfile
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ github.actor }}/ishocon2-app-${{ env.ISHOCON_APP_LANG }}:latest
       - run: make build
         timeout-minutes: 5
       - run: make up bench-with-db-init
diff --git a/Makefile b/Makefile
index 70872b44..56a52336 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ build-app: check-lang build-base
 	-t ishocon2-app-$(ISHOCON_APP_LANG):latest \
 	-t $(UNAME)/ishocon2-app-$(ISHOCON_APP_LANG):latest .;
 
-build:
+build: build-bench build-app
 	docker compose -f ./docker-compose.yml build;
 
 up: