diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8b64f0e..df69792b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,25 +1,26 @@ -name: Build on PR - +name:Build Succeds on PR Raise on: pull_request: branches: - - master - + - '**' jobs: build: + name: Build on PR Raise runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Use Node.js - uses: actions/setup-node@v3 - with: - node-version: '20' + -uses: actions/checkout@v3 + -name: Use Node.js + uses: actions/setup-node@v3 + with: + node-version: '20' + -name: Install Dependencies + run: npm install + -name: Generate Prisma Clients + run: cd/packages/db && npx prisma generate && cd ../.. + -name: Run Build + run: npm run build + - - name: Install Dependencies - run: npm install - - name: Generate prisma client - run: npm run db:generate - - - name: Run Build - run: npm run build + + \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index acbed6e5..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Build and Deploy to Docker Hub - -on: - push: - branches: - - master - -jobs: - build-and-push: - runs-on: ubuntu-latest - steps: - - name: Check Out Repo - uses: actions/checkout@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and Push Docker image - uses: docker/build-push-action@v2 - with: - context: . - file: ./docker/Dockerfile.user - push: true - tags: 100xdevs/week-18-class:latest # Replace with your Docker Hub username and repository - - - name: Verify Pushed Image - run: docker pull 100xdevs/week-18-class:latest # Replace with your Docker Hub username and repository - - - name: Deploy to EC2 - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.SSH_HOST }} - username: ${{ secrets.SSH_USERNAME }} - key: ${{ secrets.SSH_KEY }} - script: | - sudo docker pull 100xdevs/week-18-class:latest - sudo docker stop web-app || true - sudo docker rm web-app || true - sudo docker run -d --name web-app -p 3005:3000 100xdevs/week-18-class:latest \ No newline at end of file diff --git a/apps/user-app/app/api/user/route.ts b/apps/user-app/app/api/user/route.ts index c6fb73a4..2e7fae9b 100644 --- a/apps/user-app/app/api/user/route.ts +++ b/apps/user-app/app/api/user/route.ts @@ -1,3 +1,16 @@ + + + + + + + + + + + + + import { getServerSession } from "next-auth" import { NextResponse } from "next/server"; import { authOptions } from "../../lib/auth";