From d3e90bed81aa0380fe7aed650e0356d4f1127ecb Mon Sep 17 00:00:00 2001
From: Alex Tkachev <alex.leksat@gmail.com>
Date: Fri, 13 Dec 2024 11:02:34 +0400
Subject: [PATCH] Revert "fix: pass decap env vars to fe_build workflow"

This reverts commit cbc46d5e4b228215622b751757c0988693b01e89.
---
 .lagoon/Dockerfile                 | 10 +++++-----
 apps/decap/turbo.json              |  1 -
 apps/publisher/publisher.config.ts |  2 --
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.lagoon/Dockerfile b/.lagoon/Dockerfile
index 793e88f4a..5fde211f6 100644
--- a/.lagoon/Dockerfile
+++ b/.lagoon/Dockerfile
@@ -35,6 +35,11 @@ RUN --mount=type=cache,target=/tmp/cache composer install --no-dev
 
 WORKDIR /app
 
+# Decap config.
+ENV VITE_DECAP_REPO='AmazeeLabs/silverback-template'
+ARG LAGOON_GIT_BRANCH
+ENV VITE_DECAP_BRANCH="$LAGOON_GIT_BRANCH"
+
 # Copy the all package sources, install and prepare them.
 COPY . /app
 RUN --mount=type=cache,target=/tmp/cache pnpm i && \
@@ -114,11 +119,6 @@ RUN npm install -g pnpm@8.15.9
 
 COPY --from=builder /tmp/.deploy/publisher /app
 
-# Decap config.
-ENV VITE_DECAP_REPO='AmazeeLabs/silverback-template'
-ARG LAGOON_GIT_BRANCH
-ENV VITE_DECAP_BRANCH="$LAGOON_GIT_BRANCH"
-
 CMD pnpm publisher
 
 # ====================================================================================================
diff --git a/apps/decap/turbo.json b/apps/decap/turbo.json
index 5762cd9b7..b6cfb94b3 100644
--- a/apps/decap/turbo.json
+++ b/apps/decap/turbo.json
@@ -3,7 +3,6 @@
   "extends": ["//"],
   "tasks": {
     "prep:vite": {
-      "env": ["VITE_DECAP_REPO", "VITE_DECAP_BRANCH"],
       "dependsOn": ["^prep"],
       "inputs": ["src/**", "vite.config.ts", "index.html"],
       "outputs": ["dist/**"]
diff --git a/apps/publisher/publisher.config.ts b/apps/publisher/publisher.config.ts
index 65111013a..4f40ae0e4 100644
--- a/apps/publisher/publisher.config.ts
+++ b/apps/publisher/publisher.config.ts
@@ -72,8 +72,6 @@ function githubEnvVars(): Record<string, string> {
       'PUBLISHER_OAUTH2_SESSION_SECRET',
       'PUBLISHER_OAUTH2_ENVIRONMENT_TYPE',
       'PUBLISHER_OAUTH2_TOKEN_HOST',
-      'VITE_DECAP_REPO',
-      'VITE_DECAP_BRANCH',
     ].map((name) => {
       if (name === 'DRUPAL_INTERNAL_URL') {
         // No internal URLs when building on Github.