Skip to content

Commit

Permalink
Merge pull request #15 from Aak172003/trying-to-fix-db-connection
Browse files Browse the repository at this point in the history
Trying to fix db connection
  • Loading branch information
Aak172003 authored Dec 13, 2024
2 parents b45dc54 + d425c27 commit bacbcce
Show file tree
Hide file tree
Showing 52 changed files with 53 additions and 184 deletions.
2 changes: 1 addition & 1 deletion .env.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORT=5501
NODE_ENV=dev
DB_HOST = localhost
DB_HOST = host.docker.internal
DB_PORT = 5432
DB_USERNAME = root
DB_PASSWORD = root
Expand Down
131 changes: 0 additions & 131 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,134 +1,3 @@
# name: CI
# # This is the triggers block

# on:
# pull_request:
# branches:
# - main
# push:
# branches:
# - main

# jobs:
# build-and-test:
# name: Build the project
# # Run on which machine
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - name: Install Dependencies
# run: npm ci
# - name: Run ESLint
# run: npm run lint
# - name: Test and Coverage
# run: npm run test
# env:
# DB_HOST: ${{ secrets.TEST_DB_HOST }}
# DB_PORT: ${{ secrets.TEST_DB_PORT }}
# DB_USERNAME: ${{ secrets.TEST_DB_USERNAME }}
# DB_PASSWORD: ${{ secrets.TEST_DB_PASSWORD }}
# DB_NAME: ${{ secrets.TEST_DB_NAME }}
# REFRESH_SECRET_KEY: ${{ secrets.REFRESH_SECRET_KEY }}
# JWKS_URI: ${{ secrets.JWKS_URI }}
# PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
# - name: Build TypeScript
# run: npm run build
# - name: SonarCloud Scan
# uses: SonarSource/sonarcloud-github-action@master
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

# build-and-push-docker:
# name: Build and Push Docker Image
# needs: build-and-test
# runs-on: ubuntu-latest
# env:
# IMAGE_NAME: aakash1707/mernstack-auth-service
# IMAGE_TAG: build-${{ github.run_number }}
# if: github.ref == 'refs/heads/main' && github.event_name == 'push'
# steps:
# - name: Checkout Repository
# uses: actions/checkout@v3
# - name: Log into Docker Hub
# uses: docker/login-action@v1
# with:
# username: ${{ secrets.DOCKERHUB_USERNAME }}
# password: ${{ secrets.DOCKERHUB_PASSWORD }}
# - name: Build Docker Image
# run: docker build -t ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} -f docker/prod/Dockerfile .
# - name: Push Docker Image to Docker Hub
# run: docker push ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}




# name: CI
# # This is the triggers block

# on:
# pull_request:
# branches:
# - main
# push:
# branches:
# - main

# jobs:
# build-and-test:
# name: Build the project
# # Run on which machine
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - name: Install Dependencies
# run: npm ci
# - name: Run ESLint
# run: npm run lint
# - name: Test and Coverage
# run: npm run test
# env:
# DB_HOST: ${{ secrets.TEST_DB_HOST }}
# DB_PORT: ${{ secrets.TEST_DB_PORT }}
# DB_USERNAME: ${{ secrets.TEST_DB_USERNAME }}
# DB_PASSWORD: ${{ secrets.TEST_DB_PASSWORD }}
# DB_NAME: ${{ secrets.TEST_DB_NAME }}
# REFRESH_SECRET_KEY: ${{ secrets.REFRESH_SECRET_KEY }}
# JWKS_URI: ${{ secrets.JWKS_URI }}
# PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
# - name: Build TypeScript
# run: npm run build
# - name: SonarCloud Scan
# uses: SonarSource/sonarcloud-github-action@master
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

# build-and-push-docker:
# name: Build and Push Docker Image
# needs: build-and-test
# runs-on: ubuntu-latest
# env:
# IMAGE_NAME: aakash1707/mernstack-auth-service
# IMAGE_TAG: build-${{ github.run_number }}
# if: github.ref == 'refs/heads/main' && github.event_name == 'push'
# steps:
# - name: Checkout Repository
# uses: actions/checkout@v3
# - name: Log into Docker Hub
# uses: docker/login-action@v1
# with:
# username: ${{ secrets.DOCKERHUB_USERNAME }}
# password: ${{ secrets.DOCKERHUB_PASSWORD }}
# - name: Build Docker Image
# run: docker build -t ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} -f docker/prod/Dockerfile .
# - name: Push Docker Image to Docker Hub
# run: docker push ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}





name: CI
# This is the triggers block

Expand Down
4 changes: 2 additions & 2 deletions coverage/clover.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<coverage generated="1734111805955" clover="3.2.0">
<project timestamp="1734111805957" name="All files">
<coverage generated="1734130979107" clover="3.2.0">
<project timestamp="1734130979108" name="All files">
<metrics statements="1841" coveredstatements="1259" conditionals="78" coveredconditionals="56" methods="63" coveredmethods="29" elements="1982" coveredelements="1344" complexity="0" loc="1841" ncloc="1841" packages="11" files="36" classes="36"/>
<package name="src">
<metrics statements="145" coveredstatements="89" conditionals="13" coveredconditionals="7" methods="5" coveredmethods="3"/>
Expand Down
Loading

0 comments on commit bacbcce

Please sign in to comment.