From df686370abd4e1a28258f3f126a0c0df1c98deaf Mon Sep 17 00:00:00 2001
From: Keith Williams <keithwillcode@gmail.com>
Date: Thu, 13 Jul 2023 19:08:50 +0200
Subject: [PATCH] chore: Update GitHub env caching to use current PR details
 (#10096)

---
 .github/actions/env-read-file/action.yml | 10 ++++++----
 .github/workflows/env-create-file.yml    |  8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/actions/env-read-file/action.yml b/.github/actions/env-read-file/action.yml
index d1c0175e4c..d3a90d532c 100644
--- a/.github/actions/env-read-file/action.yml
+++ b/.github/actions/env-read-file/action.yml
@@ -2,14 +2,16 @@ name: "Set environment variables"
 description: "Configures environment variables for a workflow"
 runs:
   using: "composite"
+
   steps:
-    - name: Create env file
+    - name: Read env file
       uses: buildjet/cache@v3
       id: env-cache
       with:
-        path: gh.env
-        key: env-cache-${{ hashFiles('gh.env') }}
+        path: gh.env-${{ github.sha }}
+        key: env-cache
+        restore-keys: env-cache-
     - name: Set Environment Variables
       uses: tw3lveparsecs/github-actions-setvars@latest
       with:
-        envFilePath: gh.env
+        envFilePath: gh.env-${{ github.sha }}
diff --git a/.github/workflows/env-create-file.yml b/.github/workflows/env-create-file.yml
index 6cf7f6dcdb..5da229a00a 100644
--- a/.github/workflows/env-create-file.yml
+++ b/.github/workflows/env-create-file.yml
@@ -4,6 +4,7 @@ on:
   workflow_call:
 
 env:
+  ENV_FILE_NAME: gh.env-${{ github.sha }}
   INPUT_ENV_DATABASE_URL: postgresql://postgres:@localhost:5432/calendso
   INPUT_ENV_NEXT_PUBLIC_WEBAPP_URL: http://localhost:3000
   INPUT_ENV_NEXT_PUBLIC_WEBSITE_URL: http://localhost:3000
@@ -44,10 +45,11 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ozaytsev86/create-env-file@v1
+
         with:
-          file-name: ${{ github.workspace }}/gh.env
+          file-name: ${{ github.workspace }}/${{ env.ENV_FILE_NAME }}
       - uses: buildjet/cache@v3
         id: env-cache
         with:
-          path: gh.env
-          key: env-cache-${{ hashFiles('gh.env') }}
+          path: ${{ env.ENV_FILE_NAME }}
+          key: env-cache-${{ hashFiles(env.ENV_FILE_NAME) }}