From 9f8f5088a77a1f69cae7b55e30d77916b566effe Mon Sep 17 00:00:00 2001
From: Santiago Rodriguez
 <46354312+santiagorodriguez96@users.noreply.github.com>
Date: Fri, 18 Oct 2024 12:13:36 -0300
Subject: [PATCH] chore: avoid ignoring `.kamal/secrets*`

---
 .github/workflows/deploy.yml | 12 ++++--------
 .gitignore                   |  2 --
 .kamal/secrets-common        |  3 +++
 3 files changed, 7 insertions(+), 10 deletions(-)
 create mode 100644 .kamal/secrets-common

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 96db60ce..2b1a0681 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -61,13 +61,9 @@ jobs:
       - name: Expose GitHub Runtime for cache
         uses: crazy-max/ghaction-github-runtime@v3
 
-      - name: Generate kamal secrets
-        run: |
-          cat <<EOT >> .kamal/secrets.${{ inputs.destination }}
-            RAILS_MASTER_KEY=${{secrets.RAILS_MASTER_KEY}}
-            DATABASE_URL=${{secrets.DATABASE_URL}}
-            SECRET_KEY_BASE=${{secrets.SECRET_KEY_BASE}}
-          EOT
-
       - name: Run deploy command
         run: bundle exec kamal deploy -d ${{ inputs.destination }}
+        env:
+          RAILS_MASTER_KEY: ${{secrets.RAILS_MASTER_KEY}}
+          DATABASE_URL: ${{secrets.DATABASE_URL}}
+          SECRET_KEY_BASE: ${{secrets.SECRET_KEY_BASE}}
diff --git a/.gitignore b/.gitignore
index ae2f2521..ea3384cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,6 @@
 /.env*
 !/.env*.erb
 
-/.kamal/secrets*
-
 # Ignore all logfiles and tempfiles.
 /log/*
 /tmp/*
diff --git a/.kamal/secrets-common b/.kamal/secrets-common
new file mode 100644
index 00000000..bec30498
--- /dev/null
+++ b/.kamal/secrets-common
@@ -0,0 +1,3 @@
+RAILS_MASTER_KEY=$RAILS_MASTER_KEY
+DATABASE_URL=$DATABASE_URL
+SECRET_KEY_BASE=$SECRET_KEY_BASE