Merge pull request #35 from duylongpro99/development

Development

Author: duylongpro99

.github/workflows/build-reusable.yml

@@ -6,6 +6,17 @@ on:
       build_output: # Changed from build-output to build_output for consistency
         description: "Build output artifact"
         value: ${{ jobs.build.outputs.build_output }}
+    secrets:
+        NEXT_PUBLIC_CONVEX_URL:
+          required: true
+        CONVEX_DEPLOYMENT:
+          required: true
+        CLERK_SECRET_KEY:
+          required: true
+        NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY:
+          required: true
+        LIVE_BLOCK_SECRET_API_KEY:
+          required: true
 jobs:
   build:
     name: "Build"

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
     branches: [main]
 jobs:
   build:
-    if: github.event.pull_request.merged == true
+    # if: github.event.pull_request.merged == true
     name: Build Application
     uses: ./.github/workflows/build-reusable.yml
     secrets: 

.github/workflows/deploy.yml

@@ -7,6 +7,12 @@ jobs:
   build:
     name: Build Application
     uses: ./.github/workflows/build-reusable.yml
+    secrets:
+      NEXT_PUBLIC_CONVEX_URL: ${{ secrets.NEXT_PUBLIC_CONVEX_URL }}
+      CONVEX_DEPLOYMENT: ${{ secrets.CONVEX_DEPLOYMENT }}
+      CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
+      NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: ${{ secrets.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY }}
+      LIVE_BLOCK_SECRET_API_KEY: ${{ secrets.LIVE_BLOCK_SECRET_API_KEY }}
 
   deploy:
     name: Deploy Application to Vercel

next.config.ts

@@ -1,14 +1,5 @@
 import type { NextConfig } from "next";
 
-const nextConfig: NextConfig = {
-  // env: {
-  //   NEXT_PUBLIC_CONVEX_URL: process.env.NEXT_PUBLIC_CONVEX_URL,
-  //   CONVEX_DEPLOYMENT: process.env.CONVEX_DEPLOYMENT,
-  //   CLERK_SECRET_KEY: process.env.CLERK_SECRET_KEY,
-  //   NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY:
-  //     process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY,
-  //   LIVE_BLOCK_SECRET_API_KEY: process.env.LIVE_BLOCK_SECRET_API_KEY,
-  // },
-};
+const nextConfig: NextConfig = {};
 
 export default nextConfig;