Merge branch 'main' into kw/74-availability-page-functionality

icssc · Apr 22, 2024 · 6f7152f · 6f7152f
2 parents 45d0aec + 2e7a2f4
commit 6f7152f
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 54 deletions.
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -21,12 +21,10 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   CERTIFICATE_ARN: ${{ secrets.CERTIFICATE_ARN }}
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
+  DATABASE_URL: ${{ secrets.PROD_DB_URL }}
 
 jobs:
   deploy:
-    if: (!contains(github.event.pull_request.labels.*.name, 'no deploy'))
-
     runs-on: ubuntu-latest
 
     environment:
@@ -44,4 +42,4 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Deploy ZotMeet to production
-        run: pnpm sst deploy --stage prod
+        run: pnpm migrate && pnpm sst deploy --stage prod
diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -23,7 +23,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   CERTIFICATE_ARN: ${{ secrets.CERTIFICATE_ARN }}
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
+  DATABASE_URL: ${{ secrets.DEV_DB_URL }}
   PR_NUM: ${{ github.event.pull_request.number }}
 
 jobs:
@@ -47,4 +47,4 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Deploy ZotMeet to staging
-        run: pnpm sst deploy --stage staging-$PR_NUM
+        run: pnpm migrate && pnpm sst deploy --stage staging-$PR_NUM
diff --git a/.github/workflows/destroy-staging.yml b/.github/workflows/destroy-staging.yml
@@ -22,7 +22,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   CERTIFICATE_ARN: ${{ secrets.CERTIFICATE_ARN }}
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
+  DATABASE_URL: ${{ secrets.DEV_DB_URL }}
   PR_NUM: ${{ github.event.pull_request.number }}
 
 jobs:

diff --git a/package.json b/package.json
@@ -15,7 +15,8 @@
     "generate": "drizzle-kit generate:pg --config=drizzle.config.ts",
     "postinstall": "husky install && pnpm generate && svelte-kit sync",
     "lint": "eslint --quiet --fix .",
-    "migrate": "pnpm dlx tsx src/lib/db/migrate.ts",
+    "migrate": "pnpm tsx src/lib/db/migrate.ts",
+    "migrate:dev": "pnpm dotenv -- pnpm tsx src/lib/db/migrate.ts",
     "preview": "vite preview",
     "sst:deploy": "sst deploy",
     "sst:dev": "sst dev",
@@ -30,12 +31,15 @@
     "@lucia-auth/adapter-drizzle": "^1.0.3",
     "arctic": "^1.2.1",
     "clsx": "^2.1.0",
+    "dotenv": "^16.4.5",
+    "dotenv-cli": "^7.4.1",
     "drizzle-orm": "0.29.4",
     "lucia": "^3.1.1",
     "pg": "^8.11.3",
     "postgres": "3.4.3",
     "svelty-picker": "^5.2.1",
     "tailwind-merge": "^2.2.1",
+    "tsx": "^4.7.2",
     "unplugin-icons": "^0.18.1"
   },
   "devDependencies": {