Merge remote-tracking branch 'upstream/main'

.github/actions/cache-db/action.yml

@@ -15,12 +15,11 @@ runs:
       uses: actions/cache@v3
       env:
         cache-name: cache-db
-        key-1: ${{ hashFiles('packages/prisma/schema.prisma','packages/prisma/migrations/**.sql','packages/prisma/*.ts') }}
+        key-1: ${{ hashFiles('packages/prisma/schema.prisma', 'packages/prisma/migrations/**/**.sql', 'packages/prisma/*.ts') }}
+        key-2: ${{ github.event.pull_request.number || github.ref }}
       with:
         path: ${{ inputs.path }}
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ github.sha }}
+        key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ env.key-2 }}
     - run: yarn db-seed
       if: steps.cache-db.outputs.cache-hit != 'true'
       shell: bash

.github/actions/env-read-file/action.yml

@@ -11,13 +11,6 @@ runs:
         key: env-cache-${{ hashFiles('gh.env') }}
         restore-keys: env-cache-
     - name: Set Environment Variables
-      if: steps.env-cache.outputs.cache-hit == 'true'
       uses: tw3lveparsecs/github-actions-setvars@latest
       with:
-        envFilePath: gh.env
-    - name: Set Environment Variables
-      if: steps.env-cache.outputs.cache-hit != 'true'
-      shell: bash
-      run: |
-        echo "You need to run env-create-file first"
-        exit 1
+        envFilePath: gh.env

.github/actions/yarn-install/action.yml

@@ -23,7 +23,6 @@ runs:
           **/node_modules/**
           packages/prisma/zod
         key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.cache-key }}
-        restore-keys: ${{ runner.os }}-${{ env.cache-name }}-
     - name: Yarn install
       shell: bash
       if: steps.node-modules-cache.outputs.cache-hit != 'true'