Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added workflow #417

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: Build on PR

on:
pull_request:
branches:
Expand All @@ -13,13 +12,10 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: '20'

node-version: "20"
- name: Install Dependencies
run: npm install

- name: Generate prisma client
- name: Generate Prisma client
run: npm run db:generate

- name: Run Build
run: npm run build
47 changes: 16 additions & 31 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,24 @@ 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: Checkout Repo
uses: actions/checkout@v2
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- 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
- name: Build and push docker image
uses: docker/build-push-action@v2
with:
context: .
file: ./docker/Dockerfile.user
push: true
tags: dolphin687/week-18-class:latest
- name: Verify Pushed Image
run: docker pull dolphin687/week-18-class:latest
7 changes: 4 additions & 3 deletions apps/user-app/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/* testing for ci 2*/
import { getServerSession } from "next-auth";
import { redirect } from 'next/navigation'
import { redirect } from "next/navigation";
import { authOptions } from "./lib/auth";

export default async function Page() {
const session = await getServerSession(authOptions);
if (session?.user) {
redirect('/dashboard')
redirect("/dashboard");
} else {
redirect('/api/auth/signin')
redirect("/api/auth/signin");
}
}
18 changes: 0 additions & 18 deletions docker/Dockerfile.user

This file was deleted.