From ab13db8beddd75bddd35912053356ccc0cc5dda0 Mon Sep 17 00:00:00 2001
From: Bruno Perel <brunoperel@gmail.com>
Date: Sun, 8 Dec 2024 18:08:33 +0100
Subject: [PATCH] Fix turbo config

---
 .github/workflows/deploy.yml |  6 +-----
 turbo.json                   | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0e237e637..8476d9cbf 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -79,11 +79,7 @@ jobs:
 
       - name: Build apps
         run: |
-          turbo -F "...[$lastSuccessfulCommit]" -F '!~ci' -F '!~dumili' -F '!~dumili-api' build
-
-      - name: Build and push Docker images
-        run: |
-          turbo -F "...[$lastSuccessfulCommit]" -F '!~ci' -F '!~dumili' -F '!~dumili-api' prod:build-docker
+          turbo -F "...[$lastSuccessfulCommit]" -F '!~ci' -F '!~dumili' -F '!~dumili-api' build prod:build-docker
 
       - name: Send post-build files
         run: |
diff --git a/turbo.json b/turbo.json
index 4e25245f8..3d4a31c07 100644
--- a/turbo.json
+++ b/turbo.json
@@ -4,14 +4,15 @@
   "tasks": {
     "lint": {},
     "build": {
-      "passThroughEnv": ["SENTRY_AUTH_TOKEN"],
+      "passThroughEnv": [
+        "SENTRY_AUTH_TOKEN"
+      ],
       "inputs": [
         "$TURBO_DEFAULT$",
         "!api"
       ],
       "dependsOn": [
-        "^build",
-        "prod:build-docker"
+        "^build"
       ],
       "outputs": [
         "dist/**"
@@ -20,6 +21,9 @@
     "prod:build-docker": {
       "passThroughEnv": [
         "REPO_NAME"
+      ],
+      "dependsOn": [
+        "build"
       ]
     },
     "prod:deploy": {
@@ -58,10 +62,14 @@
     },
     "dev:setup": {},
     "dev:blocking": {
-      "dependsOn": ["dev:setup"]
+      "dependsOn": [
+        "dev:setup"
+      ]
     },
     "dev:blocking-up": {
-      "dependsOn": ["dev:setup"]
+      "dependsOn": [
+        "dev:setup"
+      ]
     },
     "dev": {
       "persistent": true,