wip: fix rebase conflicts

neondatabase · Dec 10, 2024 · ffaecb0 · ffaecb0
1 parent 4035670
commit ffaecb0
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/.github/workflows/build-test-vm.yaml b/.github/workflows/build-test-vm.yaml
@@ -71,19 +71,21 @@ jobs:
         # Sometimes setup-go gets stuck. Without this, it'll keep going until the job gets killed
         timeout-minutes: 10
       - name: Build daemon image
-        uses: docker/build-push-action@v6
-        env:
-          GO_BASE_IMG: ${{ format('localhost:5000/neondatabase/autoscaling-go-base-{0}:dev', inputs.arch) }}
-        with:
-          context: .
-          push: false
-          platforms: linux/${{ inputs.arch }}
-          file: neonvm-daemon/Dockerfile
-          cache-from: type=registry,ref=cache.neon.build/neonvm-daemon:cache
-          cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/neonvm-daemon:cache,mode=max' || '' }}
-          tags: ${{ steps.tags.outputs.daemon }}
-          build-args: |
-            GO_BASE_IMG=${{ env.GO_BASE_IMG }}
+      - run: make docker-build-daemon
+      # - name: Build daemon image
+      #   uses: docker/build-push-action@v6
+      #   env:
+      #     GO_BASE_IMG: ${{ format('localhost:5000/neondatabase/autoscaling-go-base-{0}:dev', inputs.arch) }}
+      #   with:
+      #     context: .
+      #     push: false
+      #     platforms: linux/${{ inputs.arch }}
+      #     file: neonvm-daemon/Dockerfile
+      #     cache-from: type=registry,ref=cache.neon.build/neonvm-daemon:cache
+      #     cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/neonvm-daemon:cache,mode=max' || '' }}
+      #     tags: ${{ steps.tags.outputs.daemon }}
+      #     build-args: |
+      #       GO_BASE_IMG=${{ env.GO_BASE_IMG }}
       - run: make bin/vm-builder
         env:
           IMG_DAEMON: ${{ steps.tags.outputs.daemon }}